From 15e7a929513ddf78c69b43ddb17ab8a8d4418cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 28 Aug 2020 19:19:13 +0200 Subject: [PATCH] xbps-src: make build options from config ang flags work together Flag options was appended to XBPS_PKG_OPTIONS, but was later overwritten by sourcing config. Instead, pass only flags options in separate variable and join at very end. --- common/xbps-src/shutils/common.sh | 10 ++++++++++ xbps-src | 11 +---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index c11a2ab5575..07211dfb793 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -167,6 +167,16 @@ set_build_options() { if [ -z "$pkgopts" -o "$pkgopts" = "" ]; then pkgopts=${XBPS_PKG_OPTIONS} fi + + # If pkg options were set in config(s), merge them with command line + if [ -n "$XBPS_ARG_PKG_OPTIONS" ]; then + if [ -n "$pkgopts" ]; then + pkgopts+=",$XBPS_ARG_PKG_OPTIONS" + else + pkgopts="$XBPS_ARG_PKG_OPTIONS" + fi + fi + OIFS="$IFS"; IFS=',' for j in ${pkgopts}; do case "$j" in diff --git a/xbps-src b/xbps-src index 93984a7ebc0..3cd19dc42ec 100755 --- a/xbps-src +++ b/xbps-src @@ -485,15 +485,6 @@ if [ -z "$IN_CHROOT" ]; then export XBPS_HOSTDIR="$(readlink -f $XBPS_HOSTDIR 2>/dev/null)" fi -# If pkg options were set in config(s), merge them with command line -if [ -n "$XBPS_ARG_PKG_OPTIONS" ]; then - if [ -n "$XBPS_PKG_OPTIONS" ]; then - export XBPS_PKG_OPTIONS+=",$XBPS_ARG_PKG_OPTIONS" - else - export XBPS_PKG_OPTIONS="$XBPS_ARG_PKG_OPTIONS" - fi -fi - # Forbid root unless XBPS_ALLOW_CHROOT_BREAKOUT is set # (for travis CI). if [ -z "$IN_CHROOT" -a "$UID" -eq 0 -a -z "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then @@ -636,7 +627,7 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \ XBPS_CPPFLAGS XBPS_CFLAGS XBPS_CXXFLAGS XBPS_FFLAGS XBPS_LDFLAGS \ XBPS_MAKEJOBS XBPS_BUILD_FORCEMODE XBPS_USE_GIT_REVS XBPS_DEBUG_PKGS \ XBPS_CHECK_PKGS XBPS_CCACHE XBPS_DISTCC XBPS_DISTCC_HOSTS XBPS_SKIP_DEPS \ - XBPS_SKIP_REMOTEREPOS XBPS_CROSS_BUILD XBPS_PKG_OPTIONS XBPS_CONFIG_FILE \ + XBPS_SKIP_REMOTEREPOS XBPS_CROSS_BUILD XBPS_ARG_PKG_OPTIONS XBPS_CONFIG_FILE \ XBPS_KEEP_ALL XBPS_HOSTDIR XBPS_MASTERDIR XBPS_SRC_VERSION \ XBPS_DESTDIR XBPS_MACHINE XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \ XBPS_LIBEXECDIR XBPS_DISTDIR XBPS_DISTFILES_MIRROR XBPS_ALLOW_RESTRICTED \