X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=tools%2Fpkg-config%2FMakefile;h=17a8737be16a1fee95ff052ae349e4f35b33aba9;hb=bcfd1d76852974170780dbe368e6194dbb0e123e;hp=bda7df7757bb91b6e7f0c71d760d08f45ea69cf5;hpb=2104af77e3231b7e79addd32464df7b0caaedf92;p=oweals%2Fopenwrt.git

diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile
index bda7df7757..17a8737be1 100644
--- a/tools/pkg-config/Makefile
+++ b/tools/pkg-config/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,24 +7,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pkg-config
-PKG_VERSION:=0.25
+PKG_VERSION:=0.29.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://pkgconfig.freedesktop.org/releases/
-PKG_MD5SUM:=a3270bab3f4b69b7dc6dbdacbcae9745
+PKG_SOURCE_URL:=https://pkgconfig.freedesktop.org/releases/
+PKG_HASH:=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
+
+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
-	$(INSTALL_DATA) $(HOST_BUILD_DIR)/pkg.m4 $(STAGING_DIR)/host/share/aclocal/
 endef
 
 define Host/Clean