[packages/rpm-pld-macros] - 2.028: if setting CMAKE_SYSTEM_NAME, set also CMAKE_SYSTEM_VERSION, or it will be empty (confusi
qboosh
qboosh at pld-linux.org
Sun Sep 3 17:37:48 CEST 2023
commit a98ddc91aefb3ead977f8f01e12c3811f4c17ff0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 3 16:50:27 2023 +0200
- 2.028: if setting CMAKE_SYSTEM_NAME, set also CMAKE_SYSTEM_VERSION, or it will be empty
(confusing some packages cmake scripts)
macros.pld | 1 +
rpm-pld-macros.spec | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index d05f7a8..56de969 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 2.027
+%define rpm_macros_rev 2.028
%define find_lang_rev 1.41
# split into individual X_prov_ver if there is a reason to desync
%define prov_ver 4.15
diff --git a/macros.pld b/macros.pld
index 7eace9a..7f9df34 100644
--- a/macros.pld
+++ b/macros.pld
@@ -488,6 +488,7 @@ CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?debug:Debug} \\\
-DCMAKE_SYSTEM_NAME=Linux \\\
+ -DCMAKE_SYSTEM_VERSION="%(uname -r)" \\\
-DCMAKE_CROSSCOMPILING:BOOL=FALSE \\\
%ifarch x32\
-DCMAKE_SYSTEM_PROCESSOR=x86_64 \\\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/a98ddc91aefb3ead977f8f01e12c3811f4c17ff0
More information about the pld-cvs-commit
mailing list