From: Jan Palus <atler@pld-linux.org>
Date: Sat, 24 Oct 2020 16:52:01 +0000 (+0200)
Subject: don't use -gnux32 on archs other than x32
X-Git-Tag: auto/th/rpm-4.16.1.2-1~41
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=ba7b32d5f30622e440fe838711c726bbd7f947ff;hp=7f5abfc0a5a7be1fbe8cce02ac1c21e86716bed6

don't use -gnux32 on archs other than x32

RPMRC_GNU is a global var which once overriden messes all platforms that
follow x32
---

diff --git a/x32.patch b/x32.patch
index 3edc36d..bef950e 100644
--- a/x32.patch
+++ b/x32.patch
@@ -71,7 +71,7 @@ diff -ur rpm-4.15.1.orig/installplatform rpm-4.15.1/installplatform
 +	ISABITS=32
 +	CANONARCH=x32
  	CANONCOLOR=3
-+	RPMRC_GNU="${RPMRC_GNU}x32"
++	FORCE_RPMRC_GNU="${RPMRC_GNU}x32"
 +	TARGETCPU="x86_64"
  	;;
      ia64)
@@ -92,14 +92,25 @@ diff -ur rpm-4.15.1.orig/installplatform rpm-4.15.1/installplatform
    PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
    [ -d $PPD ] || mkdir -p $PPD
  
-@@ -202,6 +215,7 @@
+@@ -201,7 +214,8 @@
+   | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
  	-e "s,@RPMCANONARCH@,$CANONARCH,g" \
  	-e "s,@RPMCANONCOLOR@,$CANONCOLOR," \
- 	-e "s,@RPMRC_GNU@,$RPMRC_GNU," \
+-	-e "s,@RPMRC_GNU@,$RPMRC_GNU," \
++	-e "s,@RPMRC_GNU@,${FORCE_RPMRC_GNU:-$RPMRC_GNU}," \
 +	-e "s,@TARGETCPU@,$TARGETCPU," \
  	-e "s,@LIB@,$LIB," \
  	-e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
  	-e '/\${\w*:-/!s,\${,%{_,' \
+@@ -212,6 +226,8 @@
+   | ${FILTER} \
+   > ${PPD}/macros
+ 
++  FORCE_RPMRC_GNU=
++
+ done
+ 
+ # gently adjust undefined autoconf variables to rpm macros...
 diff -ur rpm-4.15.1.orig/platform.in rpm-4.15.1/platform.in
 --- rpm-4.15.1.orig/platform.in	2019-11-13 10:19:29.371710954 +0100
 +++ rpm-4.15.1/platform.in	2019-12-29 14:47:30.886959421 +0100