packages: rpm-build-macros/rpm.macros - you want to quote the args with spa...

glen glen at pld-linux.org
Tue Jan 4 17:11:34 CET 2011


Author: glen                         Date: Tue Jan  4 16:11:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- you want to quote the args with spaces, also support shell env of xxxFLAGS

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.598 -> 1.599) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.598 packages/rpm-build-macros/rpm.macros:1.599
--- packages/rpm-build-macros/rpm.macros:1.598	Tue Jan  4 14:10:06 2011
+++ packages/rpm-build-macros/rpm.macros	Tue Jan  4 17:11:28 2011
@@ -259,9 +259,9 @@
 	-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
 	-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
 	-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-	-DCMAKE_CXX_FLAGS=%{rpmcxxflags} \\\
-	-DCMAKE_CPP_FLAGS=%{rpmcppflags} \\\
-	-DCMAKE_C_FLAGS=%{rpmcflags} \\\
+	-DCMAKE_CXX_FLAGS="${CXXFLAGS:-%{rpmcxxflags}" \\\
+	-DCMAKE_CPP_FLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
+	-DCMAKE_C_FLAGS="${CFLAGS:-%{rpmcflags}}" \\\
 %if "%{_lib}" == "lib64" \
 	-DLIB_SUFFIX=64 \\\
 %endif \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.598&r2=1.599&f=u



More information about the pld-cvs-commit mailing list