jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: create a <cross-target>-pkg-config wrapper when cross compiling.

Browse source 
This wrapper sets the env vars required for proper cross compiling, rather
than always setting them.
This commit is contained in:
Juan RP 2014-09-25 14:37:06 +02:00
parent 80ebdaa055
commit 535117078c
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/environment/configure/pkg-config.sh
View file

@ -6,10 +6,4 @@ if [ -z "$CHROOT_READY" ]; then
PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig" PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig"
fi fi
if [ "$CROSS_BUILD" ]; then
PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
PKG_CONFIG_PATH="$XBPS_CROSS_BASE/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig"
PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/lib/pkgconfig"
fi
set +a set +a

16
common/hooks/pre-configure/02-script-wrapper.sh
View file

@ -62,12 +62,28 @@ _EOF
chmod 755 ${WRAPPERDIR}/${wrapper} chmod 755 ${WRAPPERDIR}/${wrapper}
} }
pkgconfig_wrapper() {
if [ ! -x /usr/bin/pkg-config ]; then
return 0
fi
cat >>${WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config<<_EOF
#!/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"
exec /usr/bin/pkg-config "\$@"
_EOF
chmod 755 ${WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
}
hook() { hook() {
[ -z "$CROSS_BUILD" ] && return 0 [ -z "$CROSS_BUILD" ] && return 0
mkdir -p ${WRAPPERDIR} mkdir -p ${WRAPPERDIR}
# create wrapers # create wrapers
pkgconfig_wrapper
generic_wrapper icu-config generic_wrapper icu-config
generic_wrapper libgcrypt-config generic_wrapper libgcrypt-config
generic_wrapper freetype-config generic_wrapper freetype-config