From de99c9693ff01cd43262aa24a476ab9314f88a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 26 Dec 2020 20:02:15 -0300 Subject: [PATCH] environment/configure/gnu-configure: always include configure_args from template last. This makes sure that anything set in templates will override the defaults. --- common/environment/configure/gnu-configure-args.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh index 1c5f51b35c..c0a2f4602b 100644 --- a/common/environment/configure/gnu-configure-args.sh +++ b/common/environment/configure/gnu-configure-args.sh @@ -4,8 +4,12 @@ if [ -n "$build_style" -a "$build_style" != "gnu-configure" ]; then return 0 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 - --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 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" @@ -29,12 +33,18 @@ esac # Cross compilation vars if [ -z "$CROSS_BUILD" ]; then + export configure_args+=" ${TEMPLATE_CONFIGURE_ARGS}" + unset TEMPLATE_CONFIGURE_ARGS + set +a return 0 fi 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). case "$XBPS_TARGET_MACHINE" in # musl libc