pool/rpm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Schröder 2024-02-07 09:53:18 +00:00 committed by Git OBS Bridge
parent f78c5b9b1c
commit 41509ec3a7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake_hostsystemabi.diff
View File

@ -1,7 +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})
+++ CMakeLists.txt 2024-02-07 09:48:38.869899281 +0000
@@ -138,10 +138,18 @@ function(makemacros)
list(GET db_backends 0 DB_BACKEND)
- set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR})
+ if (RPM_HOST_SYSTEM_CPU)
+ set(host_cpu ${RPM_HOST_SYSTEM_CPU})
+ else()
+ set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR})
+ endif()
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} host_os)
set(host_vendor ${RPM_VENDOR})
- set(host ${host_cpu}-${host_vendor}-${host_os})

2
rpm.spec
View File

@ -248,7 +248,7 @@ cd _build
cmake .. \
%ifarch %arm
-DRPMCANONGNU=-gnueabi \
-DRPM_HOST_SYSTEM_ABI=-gnueabi \
-DRPM_HOST_SYSTEM_ABI=gnueabi \
%endif
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DCMAKE_INSTALL_MANDIR:PATH=share/man \