[packages/rpm] - fix building python module on 32bit archs

baggins baggins at pld-linux.org
Sat Nov 23 11:48:27 CET 2024


commit 49e46966f78bfce2cad805bb520e9080904bd83b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 23 10:45:49 2024 +0100

    - fix building python module on 32bit archs

 python-hash-type.patch | 20 ++++++++++++++++++++
 rpm.spec               |  2 ++
 2 files changed, 22 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 6453b78..579daac 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -89,6 +89,7 @@ Patch34:	skip-symlinks.patch
 Patch36:	build-locale.patch
 Patch37:	no-exe-for-elf-req.patch
 Patch40:	perl-heredoc-matching.patch
+Patch41:	python-hash-type.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -663,6 +664,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch36 -p1
 %patch37 -p1
 %patch40 -p1
+%patch41 -p1
 
 %{__rm} po/*.gmo
 
diff --git a/python-hash-type.patch b/python-hash-type.patch
new file mode 100644
index 0000000..2b2de68
--- /dev/null
+++ b/python-hash-type.patch
@@ -0,0 +1,20 @@
+--- rpm-4.18.2/python/header-py.c.orig	2023-11-13 13:18:27.000000000 +0100
++++ rpm-4.18.2/python/header-py.c	2024-11-23 10:43:56.360696347 +0100
+@@ -316,10 +316,17 @@
+                                  "(Oi)", s, RPMTAG_NEVR);
+ }
+ 
++#if __BITS_PER_LONG == 64
+ static long hdr_hash(PyObject * h)
+ {
+     return (long) h;
+ }
++#else
++static int hdr_hash(PyObject * h)
++{
++    return (int) h;
++}
++#endif
+ 
+ static PyObject * hdr_reduce(hdrObject *s)
+ {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/49e46966f78bfce2cad805bb520e9080904bd83b



More information about the pld-cvs-commit mailing list