[packages/rpm-build-macros] 1.675: %cmake to respect env $CC and $CXX first
glen
glen at pld-linux.org
Sun Oct 6 15:08:59 CEST 2013
commit 018307da0c6ba1be444d07405d8ee494ef741d42
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Oct 6 16:08:32 2013 +0300
1.675: %cmake to respect env $CC and $CXX first
rpm-build-macros.spec | 4 ++--
rpm.macros | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 89cdd82..9b4c8a0 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,13 +5,13 @@
%if "%{pld_release}" == "ac"
%define with_rpm4 1
%endif
-%define rpm_macros_rev 1.674
+%define rpm_macros_rev 1.675
%define find_lang_rev 1.36
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
Name: rpm-build-macros
Version: %{rpm_macros_rev}
-Release: 2
+Release: 1
License: GPL
Group: Development/Building
Source0: rpm.macros
diff --git a/rpm.macros b/rpm.macros
index f4fd66b..73e83c2 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -243,8 +243,8 @@
}
%cmake \
-%{?__cc:CC="%{__cc}"} \\\
-%{?__cxx:CXX="%{__cxx}"} \\\
+%{?__cc:CC="${CC:-%{__cc}}"} \\\
+%{?__cxx:CXX="${CXX:-%{__cxx}}"} \\\
CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
%{__cmake} \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/018307da0c6ba1be444d07405d8ee494ef741d42
More information about the pld-cvs-commit
mailing list