environment: override gettext tests for musl on native too.
This commit is contained in:
parent
d8bf6decc2
commit
f7bb54b856
2 changed files with 16 additions and 7 deletions
common/environment/configure
|
@ -1,4 +1,5 @@
|
|||
# Force detection of musl's gettext
|
||||
gt_func_gnugettext_libc=yes
|
||||
gt_cv_func_gnugettext1_libc=yes
|
||||
gt_cv_func_gnugettext2_libc=yes
|
||||
gt_cv_func_gnugettext3_libc=yes
|
||||
|
|
|
@ -14,18 +14,26 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
|
|||
export configure_args+=" --libdir=/usr/lib32"
|
||||
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
|
||||
|
||||
# From now on all vars are exported to the environment
|
||||
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).
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
# musl libc
|
||||
|
|
Loading…
Reference in a new issue