SOURCES (AC-branch): rpm.macros - use rpmcxxflags

qboosh qboosh at pld-linux.org
Thu Jun 23 09:28:44 CEST 2005


Author: qboosh                       Date: Thu Jun 23 07:28:44 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- use rpmcxxflags

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.45 -> 1.158.4.46) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.45 SOURCES/rpm.macros:1.158.4.46
--- SOURCES/rpm.macros:1.158.4.45	Fri Jun 17 16:42:35 2005
+++ SOURCES/rpm.macros	Thu Jun 23 09:28:39 2005
@@ -60,7 +60,7 @@
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
  LDFLAGS="${LDFLAGS:-%rpmldflags}" ; export LDFLAGS ; \
  CFLAGS="${CFLAGS:-%rpmcflags}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%rpmcflags}" ; export CXXFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" ; export CXXFLAGS ; \
  FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \
  CPPFLAGS="${CPPFLAGS:-}" ; export CPPFLAGS ; \
  %{?__cc:CC="%{__cc}" ; export CC ; } \
@@ -91,7 +91,7 @@
 %configure {./configure \
  	LDFLAGS="${LDFLAGS:-%rpmldflags}" \
 	CFLAGS="${CFLAGS:-%rpmcflags}" \
-	CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \
+	CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \
 	FFLAGS="${FFLAGS:-%rpmcflags}" \
 	CPPFLAGS="${CPPFLAGS:-}" \
 	%{?__cc:CC="%{__cc}"} \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.45&r2=1.158.4.46&f=u




More information about the pld-cvs-commit mailing list