From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 28 Oct 2013 15:15:12 +0000 (+0000)
Subject: pkg-config: update to latest version, fix build on Mac OS X 10.9
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8fb4f34859150fdf1432ede4fb8c5b4a653dd362;p=openwrt%2Fstaging%2Fnbd.git

pkg-config: update to latest version, fix build on Mac OS X 10.9

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38561
---

diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile
index b72f3ce457..6bd53f8610 100644
--- a/tools/pkg-config/Makefile
+++ b/tools/pkg-config/Makefile
@@ -7,17 +7,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pkg-config
-PKG_VERSION:=0.25
+PKG_VERSION:=0.28
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://pkgconfig.freedesktop.org/releases/
-PKG_MD5SUM:=a3270bab3f4b69b7dc6dbdacbcae9745
+PKG_MD5SUM:=aa3c86e67551adc3ac865160e34a2a0d
 
 HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
 HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+unexport PKG_CONFIG
+
+HOST_CONFIGURE_ARGS += --with-internal-glib
 
 define Host/Install
 	$(MAKE) -C $(HOST_BUILD_DIR) install \
diff --git a/tools/pkg-config/patches/100-disable_compat_cmd.patch b/tools/pkg-config/patches/100-disable_compat_cmd.patch
deleted file mode 100644
index 990784045e..0000000000
--- a/tools/pkg-config/patches/100-disable_compat_cmd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/parse.c
-+++ b/parse.c
-@@ -1187,15 +1187,12 @@ try_command (const char *command)
- Package *
- get_compat_package (const char *name)
- {
--#ifdef G_OS_WIN32
--  /* There has never been any of these legacy *-config scripts on
--   * Windows as far as I know. No use trying to execute them, will
--   * only confuse users to see the "blabla is not recognized as an
--   * internal or external command, operable program or batch file"
--   * messages.
-+  /*
-+   * We don't need this compatibility stuff on a system
-+   * that is free of legacy stuff 
-    */
-   return NULL;
--#else
-+#if 0
- 
-   Package *pkg;
-