From 66cdb281f156ed9da9100d8806f1fc3cf348e27c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 13 Oct 2015 10:25:30 +0200 Subject: [PATCH] hooks/pre-configure: don't overwrite PKG_CONFIG_* vars in the wrapper. This may have side effects do other packages but it was needed to fix gnome-online-accounts for cross build. goa ships a subproject that uses this vars to link against it. This commit changes the pkg-config that it preserves values in PKG_CONFIG_* if set. --- common/hooks/pre-configure/02-script-wrapper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index ea4eea4529..498c5b4354 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -70,8 +70,8 @@ pkgconfig_wrapper() { #!/bin/sh export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE" -export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig" -export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/lib/pkgconfig" +export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}" +export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}" exec /usr/bin/pkg-config "\$@" _EOF chmod 755 ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config