commit 0fdd228081912ca226abfe3dd6f9f5bf181e0721
Author: Jan Palus <[email protected]>
Date: Thu Mar 2 21:58:50 2023 +0100
in %cmake set processor x86_64 for x32; rel 3
this should be the default for _target_cpu AFAIC but at this point it's
easier to change just %cmake
macros.pld | 4 ++++
rpm-pld-macros.spec | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 9d971fb..4768956 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: 2
+Release: 3
License: GPL v2+
Group: Development/Building
Source0: macros.pld
diff --git a/macros.pld b/macros.pld
index 4fbcd17..7eace9a 100644
--- a/macros.pld
+++ b/macros.pld
@@ -489,7 +489,11 @@ CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
-DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?debug:Debug} \\\
-DCMAKE_SYSTEM_NAME=Linux \\\
-DCMAKE_CROSSCOMPILING:BOOL=FALSE \\\
+%ifarch x32\
+ -DCMAKE_SYSTEM_PROCESSOR=x86_64 \\\
+%else\
-DCMAKE_SYSTEM_PROCESSOR=%{_target_cpu} \\\
+%endif\
-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/0fdd228081912ca226abfe3dd6f9f5bf181e0721
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
