- fix %_host not containing the abi suffix on arm [bnc#1219627]

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=661

cmake_hostsystemabi.diff

@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig	2024-02-07 09:31:31.612063670 +0000
++++ CMakeLists.txt	2024-02-07 09:32:43.475911564 +0000
+@@ -141,7 +141,11 @@ function(makemacros)
+ 	set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR})
+ 	string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} host_os)
+ 	set(host_vendor ${RPM_VENDOR})
+-	set(host ${host_cpu}-${host_vendor}-${host_os})
++	if (RPM_HOST_SYSTEM_ABI)
++	    set(host ${host_cpu}-${host_vendor}-${host_os}-${RPM_HOST_SYSTEM_ABI})
++	else()
++	    set(host ${host_cpu}-${host_vendor}-${host_os})
++	endif()
+ 
+ 	set(RPMCANONVENDOR ${host_vendor})
+ 	set(RPMCANONOS ${host_os})

rpm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  7 10:34:35 CET 2024 - mls@suse.de
+
+- fix %_host not containing the abi suffix on arm [bnc#1219627]
+  new patch: cmake_hostsystemabi.diff
+
 -------------------------------------------------------------------
 Fri Feb  2 15:27:57 UTC 2024 - Ben Greiner <code@bnavigator.de>
 

rpm.spec

@@ -113,6 +113,7 @@ Patch135:       selinux_transactional_update.patch
 Patch136:       rpmsort_reverse.diff
 Patch138:       canongnu.diff
 Patch139:       cmake_python_version.diff
+Patch140:       cmake_hostsystemabi.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
@@ -226,7 +227,7 @@ rm -rf sqlite
 %patch                                                  -P 117
 %patch -P 122 -P 123
 %patch -P 131          -P 133 -P 134 -P 135 -P 136        -P 138
-%patch -P 139
+%patch -P 139 -P 140
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464
@@ -247,6 +248,7 @@ cd _build
 cmake .. \
 %ifarch %arm
   -DRPMCANONGNU=-gnueabi \
+  -DRPM_HOST_SYSTEM_ABI=-gnueabi \
 %endif
   -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
   -DCMAKE_INSTALL_MANDIR:PATH=share/man \