commit f2d42e9be0b4b925e127b0f611f122ef466c4a14
Author: Jan Rękorajski <[email protected]>
Date: Sat Dec 19 09:07:39 2020 +0100
- fix x32 arch compatibility
rpm.spec | 2 +-
x32.patch | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index fcb19e8..c2b403d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.16.0
-Release: 0.14
+Release: 0.16
Epoch: 1
License: GPL v2 / LGPL v2.1
Group: Base
diff --git a/x32.patch b/x32.patch
index 1da7bd5..c97ee5a 100644
--- a/x32.patch
+++ b/x32.patch
@@ -83,7 +83,7 @@ diff -ur rpm-4.15.1.orig/installplatform
rpm-4.15.1/installplatform
+ ISANAME=x86
+ ISABITS=x32
+ CANONARCH=x32
-+ CANONCOLOR=4
++ CANONCOLOR=7
+ FORCE_RPMRC_GNU="${RPMRC_GNU}x32"
+ TARGETCPU="x86_64"
;;
@@ -173,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,11 @@
+
+ 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/f2d42e9be0b4b925e127b0f611f122ef466c4a14
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
