[packages/rpm] append abi in target platform on %{arm}

atler atler at pld-linux.org
Sun Mar 28 19:22:28 CEST 2021


commit afd1289ea1b9cde0efd428b0fc080248522259b4
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Mar 28 18:22:16 2021 +0200

    append abi in target platform on %{arm}

 arm_abi.patch | 17 +++++++++++++++++
 rpm.spec      |  2 ++
 2 files changed, 19 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 2790aab..0203463 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -76,6 +76,7 @@ Patch17:	python-internal-build.patch
 Patch18:	missing-macros.patch
 Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
+Patch21:	arm_abi.patch
 Patch22:	ix86-platforms.patch
 Patch23:	shortcircuited-deps.patch
 Patch24:	cpuinfo-deps.patch
@@ -612,6 +613,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
diff --git a/arm_abi.patch b/arm_abi.patch
new file mode 100644
index 0000000..57c970b
--- /dev/null
+++ b/arm_abi.patch
@@ -0,0 +1,17 @@
+--- rpm-4.16.1.3/installplatform.orig	2021-03-28 17:56:17.725422731 +0200
++++ rpm-4.16.1.3/installplatform	2021-03-28 17:57:04.278251530 +0200
+@@ -111,12 +111,14 @@
+ 	ISABITS=32
+ 	CANONARCH=arm
+ 	CANONCOLOR=0
++	APPEND_TARGET_ABI=1
+ 	;;
+     arm*)
+ 	ISANAME=`echo ${ARCH} | sed "s/^\([^-]*\)-.*/\1/"`
+ 	ISABITS=32
+ 	CANONARCH=arm
+ 	CANONCOLOR=0
++	APPEND_TARGET_ABI=1
+ 	;;
+     alpha*)
+ 	ISANAME=alpha
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list