From 932b2872fae5464154b10a939173ea4676d7ee3d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Jun 2014 21:00:53 +0200 Subject: fix some static build stuff, use a pkgconf wrapper, idea from buildroot --- package/pkgconf/Makefile | 9 +++++++-- package/pkgconf/files/pkg-config | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 package/pkgconf/files/pkg-config (limited to 'package/pkgconf') diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile index 04b7c1b7a..26f33a7f6 100644 --- a/package/pkgconf/Makefile +++ b/package/pkgconf/Makefile @@ -21,8 +21,13 @@ $(eval $(call HOST_template,PKGCONF,pkgconf,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,PKGCONF,pkgconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) hostpost-install: - (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf pkg-config) - (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf $(GNU_TARGET_NAME)-pkg-config) + $(CP) ./files/pkg-config $(STAGING_HOST_DIR)/usr/bin +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) + $(SED) "s#@@OPTS@@#-static#" $(STAGING_HOST_DIR)/usr/bin/pkg-config +else + $(SED) "s#@@OPTS@@##" $(STAGING_HOST_DIR)/usr/bin/pkg-config +endif + (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkg-config $(GNU_TARGET_NAME)-pkg-config) pkgconf-install: $(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin diff --git a/package/pkgconf/files/pkg-config b/package/pkgconf/files/pkg-config new file mode 100755 index 000000000..8f64d083a --- /dev/null +++ b/package/pkgconf/files/pkg-config @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +$(dirname $0)/pkgconf @@OPTS@@ $@ -- cgit v1.2.3