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.

diff --git a/macros.pld b/macros.pld
index bb39b83dedba4e7299d78c908fc6df097151c712..4fbcd17368ff99feac10ab1f04c5b6c820b02f40 100644 (file)
--- 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} \\\

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 0783dee5e71eaa632e3c2b033c7e90143bc01511..9d971fb2cca78cd9a6228017416aebb1aad0bf45 100644 (file)
--- 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