From patchwork Tue Oct 2 13:22:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 188518 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 A8AF62C0094 for ; Tue, 2 Oct 2012 23:23:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AD323101A79; Tue, 2 Oct 2012 13:23:55 +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 0jTBXuhXn-B0; Tue, 2 Oct 2012 13:23:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D58FBFFB51; Tue, 2 Oct 2012 13:22:53 +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 5351A8F74A for ; Tue, 2 Oct 2012 13:22:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0A3F389DB6 for ; Tue, 2 Oct 2012 13:22:56 +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 mTBBnACaZznR for ; Tue, 2 Oct 2012 13:22:51 +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 EC64F8A9BA for ; Tue, 2 Oct 2012 13:22:50 +0000 (UTC) Received: from asgard (host200.186-125-82.telecom.net.ar [186.125.82.200]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q92DMi6Y025560 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 2 Oct 2012 13:22:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1349184168; bh=UcUaa/tyCbHH5ODeJc+PyLlxmeH7KIYeC2YJcBf5bBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WqJbKLT+OOP0RtnjLfX/6fz/n4woFaGGrqNXNbu41HkVoSJ5+oxQvIWBsYnNlp1eI UOw1MvYHaXmX7QGmNXDaLGebc9/q7rd+mdmNNhIVKPZC5X2AyEKpkrTo8DrU4hK/AK VTvu8+x7YgjxnmeaOWnJeZZW6/4zdFXEYktXa39o= Received: by asgard (sSMTP sendmail emulation); Tue, 02 Oct 2012 10:22:43 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 2 Oct 2012 10:22:26 -0300 Message-Id: <1349184148-28340-3-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1349184148-28340-1-git-send-email-gustavo@zacarias.com.ar> References: <1349184148-28340-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCHv4 3/5] pkg-config: remove host variant 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 Remove host-pkg-config in favour of host-pkgconf. Also remove the sysroot support patch since it's only intended for the host variant. Signed-off-by: Gustavo Zacarias --- .../pkg-config-0.25-add-with-sysroot.patch | 78 -------------------- package/pkg-config/pkg-config.mk | 14 +--- 2 files changed, 1 insertions(+), 91 deletions(-) delete mode 100644 package/pkg-config/pkg-config-0.25-add-with-sysroot.patch diff --git a/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch b/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch deleted file mode 100644 index e8431ed..0000000 --- a/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch +++ /dev/null @@ -1,78 +0,0 @@ -[PATCH] Add compiled in default sysroot - -Similar to the --with-pc-path option. It works just like the existing -PKG_CONFIG_SYSROOT_DIR environment variable, but compiled in. -The environment variable overrides this default setting if set. - -Signed-off-by: Peter Korsgaard ---- - Makefile.am | 6 +++++- - configure.in | 6 ++++++ - main.c | 9 +++++++-- - 3 files changed, 18 insertions(+), 3 deletions(-) - -Index: pkg-config-0.25/Makefile.am -=================================================================== ---- pkg-config-0.25.orig/Makefile.am -+++ pkg-config-0.25/Makefile.am -@@ -28,8 +28,12 @@ EXTRA_DIST = $(m4_DATA) $(man_MANS) READ - bin_PROGRAMS = pkg-config - AM_CFLAGS=@WARN_CFLAGS@ - -+if USE_SYSROOT -+sysroot_includes = -DPKG_CONFIG_SYSROOT="\"$(sysroot)\"" -+endif -+ - INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes) \ -- $(popt_includes) -+ $(popt_includes) $(sysroot_includes) - - pkg_config_SOURCES= \ - pkg.h \ -Index: pkg-config-0.25/configure.in -=================================================================== ---- pkg-config-0.25.orig/configure.in -+++ pkg-config-0.25/configure.in -@@ -32,6 +32,12 @@ fi - - PKG_CONFIG_FIND_PC_PATH - -+AC_ARG_WITH(sysroot, -+ [ --with-sysroot Use sysroot by default ], -+ [ sysroot="$withval" ]) -+ -+AC_SUBST([sysroot]) -+AM_CONDITIONAL(USE_SYSROOT, test "x$sysroot" != "x") - # - # Code taken from gtk+-2.0's configure.in. - # -Index: pkg-config-0.25/main.c -=================================================================== ---- pkg-config-0.25.orig/main.c -+++ pkg-config-0.25/main.c -@@ -36,10 +36,14 @@ - #undef STRICT - #endif - -+#ifndef PKG_CONFIG_SYSROOT -+#define PKG_CONFIG_SYSROOT NULL -+#endif -+ - static int want_debug_spew = 0; - static int want_verbose_errors = 0; - static int want_stdout_errors = 0; --char *pcsysrootdir = NULL; -+char *pcsysrootdir = PKG_CONFIG_SYSROOT; - - void - debug_spew (const char *format, ...) -@@ -311,7 +315,8 @@ main (int argc, char **argv) - add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S); - } - -- pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR"); -+ if (getenv ("PKG_CONFIG_SYSROOT_DIR")) -+ pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR"); - if (pcsysrootdir) - { - define_global_variable ("pc_sysrootdir", pcsysrootdir); diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk index 7440ac4..6c5e135 100644 --- a/package/pkg-config/pkg-config.mk +++ b/package/pkg-config/pkg-config.mk @@ -3,23 +3,11 @@ # pkgconfig # ############################################################# + PKG_CONFIG_VERSION = 0.25 PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/ - PKG_CONFIG_DEPENDENCIES = libglib2 - PKG_CONFIG_CONF_OPT = --with-installed-glib -HOST_PKG_CONFIG_CONF_OPT = \ - --with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig" \ - --with-sysroot="$(STAGING_DIR)" \ - --disable-static - -HOST_PKG_CONFIG_AUTORECONF = YES -HOST_PKG_CONFIG_DEPENDENCIES = - $(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config