diff options
author | Alexander Kanavin <alex@linutronix.de> | 2022-08-04 12:15:08 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2022-09-02 08:48:10 +0300 |
commit | 7e497b1566149310beb6c22bb74f43c321321943 (patch) | |
tree | 92f68e642b8893486a4db94043a5a1f85178e064 | |
parent | bea9099f0b8ecf3834354d106bae37d0eadc7217 (diff) | |
download | rpm-7e497b1566149310beb6c22bb74f43c321321943.tar.gz |
configure.ac: add linux-gnux32 variant to triplet handling
https://github.com/rpm-software-management/rpm/commit/1cdb72ae48b7ba689c5c79118f4f0c1b4ffe6b7c
introduced a change where triplets that rpm doesn't know about
are rejected, which in turn causes a regression for users like
Yocto that explicitly use them.
In particular, x32 is a 64 bit x86 ABI with 32 bit pointers and
is supported via settings in custom /etc/rpmrc:
arch_compat: qemux86_64: all any noarch x86_64_x32 qemux86_64
(cherry picked from commit 73847f81794f5ec442ef56dc417aa069c23738a9)
-rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d0bb4b793..725903373 100644 --- a/configure.ac +++ b/configure.ac @@ -899,6 +899,10 @@ if echo "$host_os" | grep '.*-gnuabi64$' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnuabi64$//'` host_os_gnu=-gnuabi64 fi +if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then + host_os=`echo "${host_os}" | sed 's/-gnux32$//'` + host_os_gnu=-gnux32 +fi if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnu$//'` fi |