append abi in target platform on %{arm}

diff --git a/arm_abi.patch b/arm_abi.patch
new file mode 100644 (file)
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

diff --git a/rpm.spec b/rpm.spec
index 2790aabed4e574e8cf36a0f419cfa88518f2d41f..0203463f777b41ce4008c6c96e22e7fa23e9af54 100644 (file)
--- 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