tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

environment: override gettext tests for musl on native too.

Browse Source
This commit is contained in:
Juan RP 2015-05-21 12:02:31 +02:00
parent d8bf6decc2
commit f7bb54b856
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/environment/configure/autoconf_cache/musl-linux
View File

@ -1,4 +1,5 @@
# Force detection of musl's gettext # Force detection of musl's gettext
gt_func_gnugettext_libc=yes
gt_cv_func_gnugettext1_libc=yes gt_cv_func_gnugettext1_libc=yes
gt_cv_func_gnugettext2_libc=yes gt_cv_func_gnugettext2_libc=yes
gt_cv_func_gnugettext3_libc=yes gt_cv_func_gnugettext3_libc=yes

22
common/environment/configure/gnu-configure-args.sh
View File

@ -14,18 +14,26 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
export configure_args+=" --libdir=/usr/lib32" export configure_args+=" --libdir=/usr/lib32"
fi fi
# Cross compilation vars
if [ -z "$CROSS_BUILD" ]; then
return 0
fi
export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
_AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
# From now on all vars are exported to the environment # From now on all vars are exported to the environment
set -a set -a
# Read autoconf cache variables for native target.
case "$XBPS_TARGET_MACHINE" in
# musl libc
*-musl) . ${_AUTOCONFCACHEDIR}/musl-linux
;;
esac
# Cross compilation vars
if [ -z "$CROSS_BUILD" ]; then
set +a
return 0
fi
export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
# Read autoconf cache variables for cross target (taken from OE). # Read autoconf cache variables for cross target (taken from OE).
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
# musl libc # musl libc