diff --git a/cmake_hostsystemabi.diff b/cmake_hostsystemabi.diff index 8ecda12..11973d1 100644 --- a/cmake_hostsystemabi.diff +++ b/cmake_hostsystemabi.diff @@ -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}) diff --git a/rpm.spec b/rpm.spec index 23ef0a3..a2982c9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -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 \