commit 44e668428f3dbcff8255944837f1c298ffab234c
Author: Jan Palus <[email protected]>
Date: Fri Feb 24 00:00:38 2023 +0100
explicitly set CMAKE_SYSTEM_{NAME,PROCESSOR} in %cmake; rel 2
don't rely on host's uname results. note that CMAKE_SYSTEM* values are
for target, host values are still availabie in CMAKE_HOST_SYSTEM*
equivalents.
CMAKE_CROSSCOMPILING also set since it's part of
CMAKE_SYSTEM_NAME/CMAKE_SYSTEM_PROCESSOR determination if not set
explicitly.
macros.pld | 3 +++
rpm-pld-macros.spec | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 0783dee..9d971fb 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -6,7 +6,7 @@ Summary: PLD Linux RPM macros
Summary(pl.UTF-8): Makra RPM dla Linuksa PLD
Name: rpm-pld-macros
Version: %{rpm_macros_rev}
-Release: 1
+Release: 2
License: GPL v2+
Group: Development/Building
Source0: macros.pld
diff --git a/macros.pld b/macros.pld
index bb39b83..4fbcd17 100644
--- a/macros.pld
+++ b/macros.pld
@@ -487,6 +487,9 @@ CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
%{__cmake} \\\
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?debug:Debug} \\\
+ -DCMAKE_SYSTEM_NAME=Linux \\\
+ -DCMAKE_CROSSCOMPILING:BOOL=FALSE \\\
+ -DCMAKE_SYSTEM_PROCESSOR=%{_target_cpu} \\\
-DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \\\
-DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \\\
-DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/44e668428f3dbcff8255944837f1c298ffab234c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
