summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild4
-rw-r--r--changelog1
-rw-r--r--pkgconf-wrapper.sh8
-rw-r--r--pkgconf.pkg/files1
4 files changed, 14 insertions, 0 deletions
diff --git a/build b/build
index b9f9cf9..0ec6ff3 100755
--- a/build
+++ b/build
@@ -18,6 +18,10 @@ install: build
# These are installed using ob-installdocs:
rm -f dest/usr/share/doc/pkgconf/AUTHORS
rm -f dest/usr/share/doc/pkgconf/README.md
+ install -d -m 0755 dest/usr/libexec
+ # Install cross-building wrapper:
+ mv dest/usr/bin/pkgconf dest/usr/libexec/pkgconf
+ install -m 0755 ../pkgconf-wrapper.sh dest/usr/bin/pkgconf
oh-fixperms
oh-strip
oh-installfiles
diff --git a/changelog b/changelog
index 842f62c..fca534a 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,7 @@ pkgconf.3 (1.7.3-1) trunk
* pkgconf: Fix self-dependency.
* Use automatic shared library dependencies.
* Organize packages into sections.
+ * Add a wrapper script to support cross building.
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Mon, 21 Dec 2020 11:21:19 -0500
diff --git a/pkgconf-wrapper.sh b/pkgconf-wrapper.sh
new file mode 100644
index 0000000..5cd1640
--- /dev/null
+++ b/pkgconf-wrapper.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ x"${OPK_HOST_ARCH}" != x'' ]; then
+ export PKG_CONFIG_LIBDIR="/usr/lib/${OPK_HOST_ARCH}/pkgconfig"
+ export PKG_CONFIG_PATH="/usr/lib/${OPK_HOST_ARCH}/pkgconfig"
+fi
+
+exec /usr/libexec/pkgconf "${@}"
diff --git a/pkgconf.pkg/files b/pkgconf.pkg/files
index 3b75854..123d237 100644
--- a/pkgconf.pkg/files
+++ b/pkgconf.pkg/files
@@ -1,2 +1,3 @@
/usr/bin/
+/usr/libexec/
/usr/share/aclocal/