- make python deps generators work on x32

[packages/rpm.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index ca28535a56ddd771a970c94fb822eaa681f10713..fa742bd18c814a5c42e5fda072ab3adaab32c26e 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -49,20 +49,6 @@ diff -ur rpm-4.15.1.orig/configure.ac rpm-4.15.1/configure.ac
  if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
        host_os=`echo "${host_os}" | sed 's/-gnu$//'`
  fi
-diff -ur rpm-4.15.1.orig/include/rpm/rpmfc.h rpm-4.15.1/include/rpm/rpmfc.h
---- rpm-4.15.1.orig/include/rpm/rpmfc.h        2019-12-29 14:10:54.518828249 +0100
-+++ rpm-4.15.1/include/rpm/rpmfc.h     2019-12-29 13:50:08.747881304 +0100
-@@ -26,8 +26,9 @@
-     RPMFC_BLACK                       = 0,
-     RPMFC_ELF32                       = (1 <<  0),
-     RPMFC_ELF64                       = (1 <<  1),
-+    RPMFC_ELFX32              = (1 <<  2),
-     RPMFC_ELFMIPSN32          = (1 <<  2),
--#define       RPMFC_ELF       (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32)
-+#define       RPMFC_ELF       (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFX32|RPMFC_ELFMIPSN32)
-       /* (1 << 3) leaks into package headers, reserved */
- 
-     RPMFC_WHITE                       = (1 << 29),
 diff -ur rpm-4.15.1.orig/installplatform rpm-4.15.1/installplatform
 --- rpm-4.15.1.orig/installplatform    2019-06-26 16:17:31.404985707 +0200
 +++ rpm-4.15.1/installplatform 2019-12-29 14:52:09.331085139 +0100
@@ -194,3 +180,18 @@ diff -ur rpm-4.15.1.orig/tools/elfdeps.c rpm-4.15.1/tools/elfdeps.c
      return marker;
  }
  
+--- rpm-4.15.1/fileattrs/python.attr~  2019-06-26 23:17:31.000000000 +0900
++++ rpm-4.15.1/fileattrs/python.attr   2020-01-04 23:33:40.929651751 +0900
+@@ -1,4 +1,4 @@
+ %__python_provides    %{_rpmconfigdir}/pythondeps.sh --provides
+ %__python_requires    %{_rpmconfigdir}/pythondeps.sh --requires
+-%__python_path        ((/lib(64)?/python[[:digit:]]\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(^%{_bindir}/python[[:digit:]]\\.[[:digit:]]+))$
++%__python_path        ((/lib(64|x32)?/python[[:digit:]]\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(^%{_bindir}/python[[:digit:]]\\.[[:digit:]]+))$
+ %__python_magic               [Pp]ython.*(executable|byte-compiled)
+--- rpm-4.15.1/fileattrs/pythondist.attr~      2019-06-26 23:17:31.000000000 +0900
++++ rpm-4.15.1/fileattrs/pythondist.attr       2020-01-04 23:34:05.680366882 +0900
+@@ -1,3 +1,3 @@
+ %__pythondist_provides        %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
+ %__pythondist_requires        %{_rpmconfigdir}/pythondistdeps.py --requires
+-%__pythondist_path            /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
++%__pythondist_path            /lib(64|x32)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$