- 4.4.1

[packages/rpm.git] / rpm-amd64.patch

diff --git a/rpm-amd64.patch b/rpm-amd64.patch
index 9a914b37370ebfc36e25faa5f5124ce917512550..414368253dc22336f3dfba00160ecab3a1ccc7ed 100644 (file)
--- a/rpm-amd64.patch
+++ b/rpm-amd64.patch
@@ -35,18 +35,6 @@ diff -urN rpm.org/build/parseSpec.c rpm/build/parseSpec.c
        arch = _free(arch);
      } else if (! strncmp("%ifos", s, sizeof("%ifos")-1)) {
        const char *os = rpmExpand("%{_target_os}", NULL);
-diff -urN rpm.org/installplatform rpm/installplatform
---- rpm.org/installplatform    2004-06-14 14:53:29.722428584 +0200
-+++ rpm/installplatform        2004-06-14 14:57:50.898723752 +0200
-@@ -66,7 +66,7 @@
-     ppc-linux) MULTILIBNO=1 ;;
-     ppc64-linux) LIB=lib64; MULTILIBNO=2 ;;
-     i?86-linux|pentium?-linux|athlon-linux) MULTILIBNO=1 ;;
--    x86_64-linux) LIB=lib64; MULTILIBNO=2 ;;
-+    x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64; MULTILIBNO=2 ;;
-   esac
- 
-   if [ -n "$MULTILIBNO" ]; then
 diff -urN rpm.org/lib/rpmrc.c rpm/lib/rpmrc.c
 --- rpm.org/lib/rpmrc.c        2004-06-14 14:53:19.117040848 +0200
 +++ rpm/lib/rpmrc.c    2004-06-14 14:55:21.421447752 +0200
@@ -80,3 +68,15 @@ diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
  
  #############################################################
  # Architecture compatibility
+diff -urN rpm.org/configure.ac rpm/configure.ac
+--- rpm.org/configure.ac       2004-07-02 23:11:17.214544320 +0200
++++ rpm/configure.ac   2004-07-02 23:11:43.369568152 +0200
+@@ -1110,7 +1110,7 @@
+ *86)          RPMCANONCOLOR=0; RPMCANONARCH=i386 ;;
+ ia32e*)               RPMCANONCOLOR=3; RPMCANONARCH=ia32e ;;
+ amd64*)               RPMCANONCOLOR=3; RPMCANONARCH=amd64 ;;
+-x86_64*)      RPMCANONCOLOR=3; RPMCANONARCH=x86_64 ;;
++x86_64*)      RPMCANONCOLOR=3; RPMCANONARCH=amd64 ;;
+ alpha*)               RPMCANONCOLOR=0; RPMCANONARCH=alpha ;;
+ sparc64*)     RPMCANONCOLOR=3; RPMCANONARCH=sparc64 ;;
+ sparc*)               RPMCANONCOLOR=3; RPMCANONARCH=sparc ;;