[packages/rpm] - restore host triplet overrides, rel 8

[baggins]

commit e4283132f9fb1858e8b52ada4d52b80a94743ff1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 9 15:08:00 2025 +0100

    - restore host triplet overrides, rel 8
    
    At least rust.spec relies on this, expecting %{_host_cpu} == x32

 rpm.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 144d1fe..46eed7f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.20.0
-Release:	7
+Release:	8
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -656,6 +656,18 @@ awk -f %{SOURCE6} %{SOURCE5}
 
 ln -s ../rpmpgp_legacy-1.1 rpmio/rpmpgp_legacy
 
+# rpm checks for CPU type at runtime, but it looks better
+%{__sed} -i \
+	-e 's|@host@|%{_target_cpu}-%{_target_vendor}-%{_target_os}|' \
+	-e 's|@host_cpu@|%{_target_cpu}|' \
+	-e 's|@host_os@|%{_target_os}|' \
+	macros.in
+
+# Use fully qualified names for CC and CXX
+__CC=$(which $(cc -dumpmachine)-gcc 2>/dev/null)
+__CXX=$(which $(c++ -dumpmachine)-g++ 2>/dev/null)
+%{__sed} -i -e "s|@__CC@|$__CC|" -e "s|@__CXX@|$__CXX|" macros.in
+
 %build
 mkdir -p build-cmake
 cd build-cmake
================================================================

---- gitweb:

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