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

environment/configure/gnu-configure: always include configure_args from

Browse source 
template last.

This makes sure that anything set in templates will override the
defaults.
This commit is contained in:
Érico Rolim 2020-12-26 20:02:15 -03:00 • committed by Érico Nogueira Rolim
parent 12694050dd
commit de99c9693f
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,8 +4,12 @@ if [ -n "$build_style" -a "$build_style" != "gnu-configure" ]; then
return 0 return 0
fi fi
# Store args from template so they can be included last and override
# our defaults
TEMPLATE_CONFIGURE_ARGS="${configure_args}"
export configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin export configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin
--mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var ${configure_args}" --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var"
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
@ -29,12 +33,18 @@ esac
# Cross compilation vars # Cross compilation vars
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
export configure_args+=" ${TEMPLATE_CONFIGURE_ARGS}"
unset TEMPLATE_CONFIGURE_ARGS
set +a set +a
return 0 return 0
fi fi
export 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 "
export configure_args+=" ${TEMPLATE_CONFIGURE_ARGS}"
unset TEMPLATE_CONFIGURE_ARGS
# 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