- use gnux32 suffic from script command line

[packages/rpm.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 38aa1407190493dfb8f5a38824f1718168ef6022..a97fdb785d9a18148159ce0fe7836288578cbeb1 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -51,12 +51,13 @@ diff -ur rpm-4.16.1.2/build/rpmfc.h rpm-4.16.1.2.x32/build/rpmfc.h
 diff -ur rpm-4.16.1.2/configure.ac rpm-4.16.1.2.x32/configure.ac
 --- rpm-4.16.1.2/configure.ac  2021-03-21 21:51:28.221530479 +0100
 +++ rpm-4.16.1.2.x32/configure.ac      2021-03-21 21:50:04.127398387 +0100
-@@ -930,6 +930,9 @@
+@@ -930,6 +930,10 @@
        host_os=`echo "${host_os}" | sed 's/-gnueabi$//'`
        host_os_gnu=-gnueabi
  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$//'`
@@ -104,7 +105,7 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
  
    # XXX FIXME: incomplete and quite likely wrong too in places,
    # consult various arch folks for correct names etc.
-@@ -75,7 +77,16 @@
+@@ -75,7 +77,15 @@
        ISANAME=x86
        ISABITS=64
        CANONARCH=x86_64
@@ -116,18 +117,12 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
 +      ISABITS=x32
 +      CANONARCH=x32
 +      CANONCOLOR=7
-+      RPMRC_GNU="gnux32"
 +      FORCE_RPMRC_GNU="%{?_gnu}"
 +      TARGETCPU="x86_64"
        ;;
      ia64)
        ISANAME=ia
-@@ -190,10 +201,14 @@
-   # skip architectures for which we dont have full config parameters
-   [ -z "$CANONARCH" ] && continue
- 
--  if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
-+  if [ "$OS" = "linux" ] && [ "$CANONARCH" = "x86_64" ]; then
+@@ -190,6 +201,10 @@
        LIB=${LIB}64
    fi