bs: add helper tool pkg-config

diff --git a/Makefile b/Makefile
index 5f03c339ef89d3790b019b72a3edc6023e1aa3a0..8b66eb4ab5e7168fd693d44541e9e1bfd5335320 100755 (executable)
--- 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 a66bc05a67228d795e5caae115d8bde00ba09673..32f0d2d8fc5d12ba1873a5c339e8758a899e183f 100755 (executable)
--- 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 c68a74998e173ff2131562916280896dfa602a62..2e32c25f98fc8c83a1f232afbcf7640fd298a0cf 100755 (executable)
--- 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 25495cffd6c94eda6f83fcad1538c9e34ba4f32e..4efedf956ea136a2b45edfe36fbea01d9cf585b8 100644 (file)
--- 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