X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=x32.patch;h=5be418e40fb32fc91a94f06c8490404460a934d7;hp=3edc36df391147ebd2bbc5b8c98c9720baf792b3;hb=5c979c25d86acbce9c978e4e5b1a39bb3bbf1a18;hpb=24b1f498de2be74196ac72500aba423a90dc075a

diff --git a/x32.patch b/x32.patch
index 3edc36d..5be418e 100644
--- a/x32.patch
+++ b/x32.patch
@@ -64,14 +64,15 @@ diff -ur rpm-4.15.1.orig/installplatform rpm-4.15.1/installplatform
  	ISANAME=x86
  	ISABITS=64
  	CANONARCH=x86_64
+-	CANONCOLOR=3
 +	CANONCOLOR=7
 +	;;
 +    x32)
 +	ISANAME=x86
 +	ISABITS=32
 +	CANONARCH=x32
- 	CANONCOLOR=3
-+	RPMRC_GNU="${RPMRC_GNU}x32"
++	CANONCOLOR=4
++	FORCE_RPMRC_GNU="${RPMRC_GNU}x32"
 +	TARGETCPU="x86_64"
  	;;
      ia64)
@@ -92,14 +93,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