From patchwork Tue Sep 25 19:08:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 186878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 631402C007A for ; Wed, 26 Sep 2012 05:08:52 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CB909100C35; Tue, 25 Sep 2012 19:08:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 71+qYfFCt-nr; Tue, 25 Sep 2012 19:08:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 422D51004CC; Tue, 25 Sep 2012 19:08:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 96E5E8F74B for ; Tue, 25 Sep 2012 19:08:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A93E88A33F for ; Tue, 25 Sep 2012 19:08:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xrsohUd6rkSw for ; Tue, 25 Sep 2012 19:08:44 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [85.10.205.246]) by whitealder.osuosl.org (Postfix) with ESMTPS id 74F598A370 for ; Tue, 25 Sep 2012 19:08:44 +0000 (UTC) Received: from asgard (host55.190-231-14.telecom.net.ar [190.231.14.55]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q8PJ8a8m027611 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 25 Sep 2012 19:08:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1348600121; bh=CnBYEGpFJloxX7785SsAc5Jj7VX3qjVRmqCRtDtzl0c=; h=From:To:Cc:Subject:Date; b=RoIhKe8EaqRlDSFAiSKKS6iFDk8Qmd3Jaiz4Ckf2zG341gM/i5n+ZrJH+YkmwycMv EMu4v8JtI7j+PHZhJ3T8/6sg4nZiykq6PIllF7FbJTtcIALQEmeMCf3/XACiv0HsUo avNul4jhLVhLsD04CAmqBG58N6hhU3QU5Yt/kWCI= Received: by asgard (sSMTP sendmail emulation); Tue, 25 Sep 2012 16:08:35 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 25 Sep 2012 16:08:34 -0300 Message-Id: <1348600115-27059-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 1/2] pkgconf: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net pkgconf is a drop-in replacement for pkg-config that doesn't need itself to build and just requires a C89 compiler. Instead of using a patch for hardcoded sysroot support (as the patch to pkg-config does) we instead rely on a wrapper script that takes the appropiate action. Signed-off-by: Gustavo Zacarias Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/pkgconf/Config.in | 9 +++++++++ package/pkgconf/pkg-config.in | 2 ++ package/pkgconf/pkgconf.mk | 31 +++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 package/pkgconf/Config.in create mode 100644 package/pkgconf/pkg-config.in create mode 100644 package/pkgconf/pkgconf.mk diff --git a/package/Config.in b/package/Config.in index 82c319e..0c17918 100644 --- a/package/Config.in +++ b/package/Config.in @@ -84,6 +84,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/patch/Config.in" endif source "package/pkg-config/Config.in" +source "package/pkgconf/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/sed/Config.in" endif diff --git a/package/pkgconf/Config.in b/package/pkgconf/Config.in new file mode 100644 index 0000000..f95847f --- /dev/null +++ b/package/pkgconf/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PKGCONF + bool "pkgconf" + help + pkgconf is a program which helps to configure compiler and linker + flags for development frameworks. It is similar to pkg-config, + but was written from scratch in the summer of 2011 to replace + pkg-config, which now needs itself to build itself + + https://github.com/nenolod/pkgconf diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in new file mode 100644 index 0000000..79cd8d8 --- /dev/null +++ b/package/pkgconf/pkg-config.in @@ -0,0 +1,2 @@ +#!/bin/sh +PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-@STAGING_DIR@} @HOST_DIR@/usr/bin/pkgconf $@ diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk new file mode 100644 index 0000000..5c51735 --- /dev/null +++ b/package/pkgconf/pkgconf.mk @@ -0,0 +1,31 @@ +############################################################# +# +# pkgconf +# +############################################################# + +PKGCONF_VERSION = 0.8.9 +PKGCONF_SITE = http://tortois.es/~nenolod/distfiles +PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2 + +HOST_PKGCONF_CONF_OPT = \ + --with-pkg-config-dir="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig" + +define PKGCONF_LINK_PKGCONFIG + ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config +endef + +define HOST_PKGCONF_INSTALL_WRAPPER + $(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \ + $(HOST_DIR)/usr/bin/pkg-config + $(SED) 's,@HOST_DIR@,$(HOST_DIR),' $(HOST_DIR)/usr/bin/pkg-config + $(SED) 's,@STAGING_DIR@,$(STAGING_DIR),' $(HOST_DIR)/usr/bin/pkg-config +endef + +PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG +HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) + +PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config