- fix line count in patch

[packages/rpm.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 3edc36df391147ebd2bbc5b8c98c9720baf792b3..43b2f2b6df2904c8200ad07d06653bddf9ee523c 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -22,6 +22,18 @@ diff -ur rpm-4.15.1.orig/build/rpmfc.c rpm-4.15.1/build/rpmfc.c
        if (fcolor & RPMFC_INCLUDE)
            break;
      }
+@@ -1152,7 +1152,10 @@
+               color = RPMFC_ELF64;
+               break;
+           case ELFCLASS32:
+-              color = RPMFC_ELF32;
++              if (ehdr.e_machine == EM_X86_64)
++                  color = RPMFC_ELFX32;
++              else
++                  color = RPMFC_ELF32;
+               break;
+           }
+           elf_end(elf);
 diff -ur rpm-4.15.1.orig/build/rpmfc.h rpm-4.15.1/build/rpmfc.h
 --- rpm-4.15.1.orig/build/rpmfc.h      2019-06-26 16:17:31.397985717 +0200
 +++ rpm-4.15.1/build/rpmfc.h   2019-12-29 13:45:05.936980833 +0100
@@ -64,14 +76,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
++      ISABITS=x32
 +      CANONARCH=x32
-       CANONCOLOR=3
-+      RPMRC_GNU="${RPMRC_GNU}x32"
++      CANONCOLOR=7
++      FORCE_RPMRC_GNU="${RPMRC_GNU}x32"
 +      TARGETCPU="x86_64"
        ;;
      ia64)
@@ -92,14 +105,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
@@ -149,11 +173,16 @@ diff -ur rpm-4.15.1.orig/rpmrc.in rpm-4.15.1/rpmrc.in
  buildarchtranslate: sh3: sh3
  buildarchtranslate: sh4: sh4
  buildarchtranslate: sh4a: sh4
-@@ -490,6 +496,8 @@
+@@ -486,10 +492,12 @@
+ 
+ arch_compat: ia64: noarch
+ 
+-arch_compat: x86_64: amd64 em64t athlon noarch
++arch_compat: x86_64: amd64 em64t athlon x32 noarch
  arch_compat: amd64: x86_64 em64t athlon noarch
  arch_compat: ia32e: x86_64 em64t athlon noarch
  
-+arch_compat: x32: x32 noarch
++arch_compat: x32: x32 x86_64 noarch
 +
  arch_compat: sh3: noarch
  arch_compat: sh4: noarch