fix some static build stuff, use a pkgconf wrapper, idea from buildroot

5 files changed, 37 insertions, 2 deletions

diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index 8055f2a3a..add3bee6e 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -25,6 +25,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 pre-install:
 	$(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz
 	$(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz
diff --git a/package/harfbuzz/patches/patch-Makefile_am b/package/harfbuzz/patches/patch-Makefile_am
new file mode 100644
index 000000000..64498b59c
--- /dev/null
+++ b/package/harfbuzz/patches/patch-Makefile_am
@@ -0,0 +1,11 @@
+--- harfbuzz-0.9.28.orig/Makefile.am	2014-03-04 22:00:34.076514970 +0100
++++ harfbuzz-0.9.28/Makefile.am	2014-06-22 19:46:18.230010420 +0200
+@@ -4,7 +4,7 @@ NULL =
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = src util test docs
++SUBDIRS = src util
+ 
+ EXTRA_DIST = \
+ 	autogen.sh \
diff --git a/package/harfbuzz/patches/patch-configure_ac b/package/harfbuzz/patches/patch-configure_ac
new file mode 100644
index 000000000..33de94a12
--- /dev/null
+++ b/package/harfbuzz/patches/patch-configure_ac
@@ -0,0 +1,15 @@
+--- harfbuzz-0.9.28.orig/configure.ac	2014-04-28 23:30:44.308730444 +0200
++++ harfbuzz-0.9.28/configure.ac	2014-06-22 19:41:33.532833719 +0200
+@@ -417,12 +417,6 @@ src/Makefile
+ src/hb-version.h
+ src/hb-ucdn/Makefile
+ util/Makefile
+-test/Makefile
+-test/api/Makefile
+-test/shaping/Makefile
+-docs/Makefile
+-docs/reference/Makefile
+-docs/reference/version.xml
+ ])
+ 
+ AC_OUTPUT
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@@ $@