wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-29 08:52:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xbps-src: default to the same libc when -a is given but not -A

Browse source
This commit is contained in:
Duncaen 2025-05-29 19:32:45 +02:00 • committed by Duncan Overbruck
parent 07b48b67fa
commit 659c5f4306
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xbps-src
View file

@ -382,7 +382,6 @@ XBPS_VERSION=$(xbps-uhelper -V)
XBPS_VERSION=${XBPS_VERSION%%API*}
XBPS_VERSION=${XBPS_VERSION##*:}
readonly XBPS_SRC_VERSION="113"
export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
XBPS_OPTIONS=
XBPS_OPTSTRING="1A:a:bc:CEfgGhH:iIj:Lm:No:p:qsQKr:tvV"
@ -521,11 +520,23 @@ else
: ${XBPS_MAKEJOBS:=1}
fi
if [ -z "$XBPS_MACHINE" ]; then
XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
# default to the same libc when -a is given but not -A
if [ -n "$XBPS_CROSS_BUILD" ]; then
if [ -z "${XBPS_CROSS_BUILD##*-musl}" ]; then
XBPS_MACHINE="${XBPS_MACHINE%-musl}-musl"
else
XBPS_MACHINE="${XBPS_MACHINE%-musl}"
fi
fi
fi
export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \
XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \
XBPS_MAKEJOBS XBPS_PRINT_VARIABLES XBPS_IGNORE_BROKENNESS
XBPS_MAKEJOBS XBPS_PRINT_VARIABLES XBPS_IGNORE_BROKENNESS XBPS_MACHINE
# The masterdir/hostdir variables are forced and readonly in chroot
if [ -z "$IN_CHROOT" ]; then