mirror of https://git.tukaani.org/xz.git
CI: Workaround buggy config.guess on Ubuntu 22.04LTS and 24.04LTS
Check for the wrong triplet from config.guess and override it with the --build option on the configure command line. Then i386 assembly autodetection will work. These Ubuntu versions (and as of writing, also Debian unstable) ship config.guess version 2022-01-09 which contains a bug that was fixed in version 2022-05-08. It results in a wrong configure triplet when using CC="gcc -m32" to build i386 binaries. Upstream fix: https://git.savannah.gnu.org/cgit/config.git/commit/?id=f56a7140386d08a531bcfd444d632b28c61a6329 More information: https://mail.gnu.org/archive/html/config-patches/2022-05/msg00003.html
This commit is contained in:
parent
dbcdabf68f
commit
1bf83cded2
|
@ -217,6 +217,15 @@ then
|
||||||
add_extra_option "$CLMUL" "" "--disable-clmul-crc"
|
add_extra_option "$CLMUL" "" "--disable-clmul-crc"
|
||||||
add_extra_option "$SANDBOX" "" "--enable-sandbox=no"
|
add_extra_option "$SANDBOX" "" "--enable-sandbox=no"
|
||||||
|
|
||||||
|
# Workaround a bug in too old config.guess. Version with
|
||||||
|
# timestamp='2022-05-08' would be needed but the autotools-dev
|
||||||
|
# package has 2022-01-09 in Ubuntu 22.04LTS and 24.04LTS. The
|
||||||
|
# bug breaks i386 assembler usage autodetection.
|
||||||
|
if "$SRC_DIR/build-aux/config.guess" | grep -q x86_64-pc-linux-gnux32
|
||||||
|
then
|
||||||
|
EXTRA_OPTIONS="$EXTRA_OPTIONS --build=i686-pc-linux-gnu"
|
||||||
|
fi
|
||||||
|
|
||||||
# Run configure script
|
# Run configure script
|
||||||
"$SRC_DIR"/configure --enable-werror --enable-checks="$CHECK_TYPE" $EXTRA_OPTIONS --config-cache
|
"$SRC_DIR"/configure --enable-werror --enable-checks="$CHECK_TYPE" $EXTRA_OPTIONS --config-cache
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue