moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Infrastructure changes to allow unsetting template vars/funcs.

Browse source 
xbps-src-112 does not unset those vars/funcs anymore, so it's a work
that must be done via common/environment/setup{,-subpkg}.
This commit is contained in:
Juan RP 2014-03-19 09:03:21 +01:00
parent 38c7494c9e
commit 0026342862
10 changed files with 89 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/environment/configure/gnu-configure-args.sh
View file

@ -1,7 +1,7 @@
# This file sets up configure_args with common settings.
if [ -z "$build_style" -o "$build_style" = "gnu-configure" ]; then
configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
fi
@ -10,10 +10,13 @@ if [ -z "$CROSS_BUILD" ]; then
return 0
fi
configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
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 cross target (taken from OE).
case "$XBPS_TARGET_MACHINE" in
# musl libc
@ -56,3 +59,5 @@ case "$XBPS_TARGET_MACHINE" in
esac
unset _AUTOCONFCACHEDIR
set +a # vars are not exported to the environment anymore