[packages/rpm] - x32 patch fixes
baggins
baggins at pld-linux.org
Tue Mar 23 08:53:00 CET 2021
commit b10d9d9e984edbf3157c9fee959c0868486a2f93
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Mar 23 08:52:27 2021 +0100
- x32 patch fixes
x32.patch | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/x32.patch b/x32.patch
index 38aa140..f7ab616 100644
--- 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$//'`
@@ -122,12 +123,7 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
;;
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/b10d9d9e984edbf3157c9fee959c0868486a2f93
More information about the pld-cvs-commit
mailing list