X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fpkg-config%2FMakefile;h=40e6e083e887a0d373c36962c54fe36214947cb1;hb=d4f32fda8b60771b7d21bf60b99b152b64ec609c;hp=b4a2d5d5571773b0e20fd22f3e168736a7d0ccd9;hpb=7c1a666f5ce421b78a6a05786207ba5b4ddb1c2b;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile
index b4a2d5d557..40e6e083e8 100644
--- a/tools/pkg-config/Makefile
+++ b/tools/pkg-config/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,21 +7,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pkg-config
-PKG_VERSION:=0.22
+PKG_VERSION:=0.29
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://pkgconfig.freedesktop.org/releases/
-PKG_MD5SUM:=fd5c547e9d66ba49bc735ccb8c791f2a
+PKG_MD5SUM:=77f27dce7ef88d0634d0d6f90e03a77f
+
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
-endef
+unexport PKG_CONFIG
+
+HOST_CONFIGURE_ARGS += --with-internal-glib
+
+ifeq ($(HOST_OS),Darwin)
+HOST_LDFLAGS += -framework CoreFoundation -framework Carbon
+endif
 
 define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) \
-		install
+	$(MAKE) -C $(HOST_BUILD_DIR) install
 	mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real
 	$(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
 endef