From b0a3c85f9c84411fa2360085e576a3371b372a90 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Tue, 10 Nov 2015 23:04:08 +0100
Subject: [PATCH] bs: add helper tool pkg-config

---
 Makefile          |  2 +-
 make/archives.mk  |  3 +++
 make/bootstrap.mk | 16 ++++++++++++++++
 make/versions.mk  |  3 +++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5f03c33..8b66eb4 100755
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,7 @@ prerequisites:
 
 # bootstrap.mk
 bootstrap:
-	$(MAKE) targetprefix $(BUILD_TMP) $(CROSS_BASE) $(HOSTPREFIX)/bin includes-and-libs modules $(TARGETPREFIX)/lib/libc.so.6 $(ARCHIVE)
+	$(MAKE) targetprefix $(BUILD_TMP) $(CROSS_BASE) $(HOSTPREFIX)/bin pkg-config includes-and-libs modules $(TARGETPREFIX)/lib/libc.so.6 $(ARCHIVE)
 includes-and-libs:
 	$(MAKE) $(TARGETPREFIX)/lib $(TARGETPREFIX)/lib/firmware
 modules:
diff --git a/make/archives.mk b/make/archives.mk
index a66bc05..32f0d2d 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -180,6 +180,9 @@ $(ARCHIVE)/libxslt-git-snapshot.tar.gz:
 $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz:
 	$(WGET) http://crux.ster.zone/distfiles/rtmpdump-$(LIBRTMP_VER).tar.gz
 
+$(ARCHIVE)/pkg-config-$(PKGCONFIG_VER).tar.gz:
+	$(WGET) http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCONFIG_VER).tar.gz
+
 $(ARCHIVE)/crosstool-1.16.0-downloads.tar.bz2:
 	$(WGET) http://www.fhloston-paradise.de/crosstool-ng-1.16.0.tar.bz2
 	$(WGET) http://www.fhloston-paradise.de/eglibc-2_13.tar.bz2
diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index c68a749..2e32c25 100755
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -17,6 +17,22 @@ $(TARGETPREFIX):
 	@echo ""
 	@false
 
+pkg-config-preqs:
+	@PATH=$(subst $(HOSTPREFIX)/bin:,,$(PATH)); \
+		if ! pkg-config --exists glib-2.0; then \
+			echo "pkg-config and glib2-devel packages are needed for building cross-pkg-config."; false; \
+		fi
+
+pkg-config: $(HOSTPREFIX)/bin/pkg-config
+$(HOSTPREFIX)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(PKGCONFIG_VER).tar.gz | $(HOSTPREFIX)/bin pkg-config-preqs
+	$(UNTAR)/pkg-config-$(PKGCONFIG_VER).tar.gz
+	set -e; cd $(BUILD_TMP)/pkg-config-$(PKGCONFIG_VER); \
+		./configure --with-pc_path=$(PKG_CONFIG_PATH); \
+		$(MAKE); \
+		cp -a pkg-config $(HOSTPREFIX)/bin; \
+	ln -sf pkg-config $(HOSTPREFIX)/bin/$(TARGET)-pkg-config
+	$(REMOVE)/pkg-config-$(PKGCONFIG_VER)
+
 skeleton: | $(TARGETPREFIX)
 	if [ $(PLATFORM) = "apollo" ]; then \
 		cp --remove-destination -a skel-root-apollo/* $(TARGETPREFIX)/; \
diff --git a/make/versions.mk b/make/versions.mk
index 25495cf..4efedf9 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -6,6 +6,9 @@ LIBUPNP_VER = 1.6.19
 # including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
 LIBRTMP_VER = 2.4_p20131018
 
+# pkg-config; a helper tool used when compiling applications and libraries to insert the correct compiler options
+PKGCONFIG_VER=0.28
+
 # ushare; uShare is a UPnP (TM) A/V Media Server.
 USHARE_VER = 1.1a
 
-- 
2.39.5