xbps-src: create a <cross-target>-pkg-config wrapper when cross compiling.
This wrapper sets the env vars required for proper cross compiling, rather than always setting them.
This commit is contained in:
parent
80ebdaa055
commit
535117078c
|
@ -6,10 +6,4 @@ if [ -z "$CHROOT_READY" ]; then
|
|||
PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig"
|
||||
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
|
||||
|
|
|
@ -62,12 +62,28 @@ _EOF
|
|||
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() {
|
||||
[ -z "$CROSS_BUILD" ] && return 0
|
||||
|
||||
mkdir -p ${WRAPPERDIR}
|
||||
|
||||
# create wrapers
|
||||
pkgconfig_wrapper
|
||||
generic_wrapper icu-config
|
||||
generic_wrapper libgcrypt-config
|
||||
generic_wrapper freetype-config
|
||||
|
|
Loading…
Reference in New Issue