From 57e29808e354072e880c053eeb5cee10823b02ec Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Mon, 23 Aug 2021 19:49:56 +0200 Subject: [PATCH] strace.spec: remove injected -m64 options from CFLAGS/CPPFLAGS They are unnecessary and break m32/mx32 runtime compilation. * strace.spec (%build): Filter out "-m64" out of CFLAGS and CPPFLAGS. (%changelog): Mention the change. Resolves: #1996676 Signed-off-by: Eugene Syromiatnikov --- strace.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/strace.spec b/strace.spec index 4049078..d73f7b3 100644 --- a/strace.spec +++ b/strace.spec @@ -96,6 +96,16 @@ kver="$(printf '%%s\n%%s\n' '#include ' 'LINUX_VERSION_CODE' | printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256)) echo 'END OF BUILD ENVIRONMENT INFORMATION' +CFLAGS="$RPM_OPT_FLAGS $LDFLAGS" +# Removing explicit -m64 as it breaks mpers +[ "x${CFLAGS#*-m64}" = "x${CFLAGS}" ] || CFLAGS=$(echo "$CFLAGS" | sed 's/-m64//g') +export CFLAGS + +CPPFLAGS="-isystem %{_includedir} %{optflags}" +# Removing explicit -m64 as it breaks mpers +[ "x${CPPFLAGS#*-m64}" = "x${CPPFLAGS}" ] || CPPFLAGS=$(echo "$CPPFLAGS" | sed 's/-m64//g') +export CPPFLAGS + CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD %configure --enable-mpers=check %make_build @@ -132,6 +142,8 @@ echo 'END OF TEST SUITE INFORMATION' with upstream v5.13-10-g0211fdc "tests: change sockopt-timestamp test to use syscall(__NR_recvmsg)" and 0154-tests-call-setsockopt-directly-in-sockopt-timestamp.patch. +- Undo forceful injection of -m64 into CFLAGS/CPPFLAGS to avoid breaking + mpers and its tests (#1996676). * Tue Aug 10 2021 Mohan Boddu - 5.13-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags