SOURCES: rpm.macros - use rpmcppflags

[arekm]

Author: arekm                        Date: Thu Jul 24 07:06:38 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use rpmcppflags

---- Files affected:
SOURCES:
   rpm.macros (1.469 -> 1.470) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.469 SOURCES/rpm.macros:1.470
--- SOURCES/rpm.macros:1.469	Thu Jul 17 14:34:51 2008
+++ SOURCES/rpm.macros	Thu Jul 24 09:06:32 2008
@@ -69,6 +69,7 @@
 # Flags specified in %filterout_* are removed from %rpm*flags, exactly:
 # %rpmcflags    = %optflags - %filterout - %filterout_c   - %filterout_ld
 # %rpmcxxflags  = %optflags - %filterout - %filterout_cxx - %filterout_ld
+# %rpmcppflags  = %optcppflags - %filterout - %filterout_cpp - %filterout_ld
 # %rpmldflags   = %optldflags - %filterout_ld
 #
 # Regular expressions are supported, but to avoid some character be treated
@@ -94,6 +95,12 @@
 	%{filter_out}
 }')
 
+%rpmcppflags %(awk 'BEGIN {
+	split("%{?debug:%debugcppflags}%{!?debug:%optcppflags}%{?debuginfocppflags}",I);
+	split("%{?filterout} %{?filterout_cpp} %{?filterout_cpp}",F);
+	%{filter_out}
+}')
+
 %rpmldflags %(awk 'BEGIN {
 	split("%{?optldflags}",I);
 	split("%{?filterout_ld}",F)
@@ -122,7 +129,7 @@
  CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" ; export CXXFLAGS ; \
  FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \
  FCFLAGS="${FCFLAGS:-%rpmcflags}" ; export FCFLAGS ; \
- CPPFLAGS="${CPPFLAGS:-}" ; export CPPFLAGS ; \
+ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" ; export CPPFLAGS ; \
  %{?__cc:CC="%{__cc}" ; export CC ; } \
  %{?__cxx:CXX="%{__cxx}" ; export CXX ; } \
  %{?configuredir:%{configuredir}}%{!?configuredir:.}/configure \
@@ -162,7 +169,7 @@
 	CFLAGS="${CFLAGS:-%rpmcflags}" \
 	CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \
 	FFLAGS="${FFLAGS:-%rpmcflags}" \
-	CPPFLAGS="${CPPFLAGS:-}" \
+	CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	%{?__cc:CC="%{__cc}"} \
 	%{?__cxx:CXX="%{__cxx}"} \
 	libsuffix=%{_lib} \
@@ -191,7 +198,7 @@
 	CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \
 	FFLAGS="${FFLAGS:-%rpmcflags}" \
 	FCFLAGS="${FCFLAGS:-%rpmcflags}" \
-	CPPFLAGS="${CPPFLAGS:-}" \
+	CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	%{?__cc:CC="%{__cc}"} \
 	%{?__cxx:CXX="%{__cxx}"} \
 	--host=%{_target_platform} \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.469&r2=1.470&f=u