[SCM] libav/hardening: Set CPPFLAGS separately.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the hardening branch:
commit de1d8cbc73b3fccfd8f8652af5ffe3fcc5a78376
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Mar 2 14:00:15 2012 +0100

    Set CPPFLAGS separately.

diff --git a/debian/confflags b/debian/confflags
index 78877f2..bd26216 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -152,7 +152,7 @@ endif
 
 # Enable hardened build flags through dpkg-buildflags
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
-CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS := $(filter-out %-Bsymbolic-functions,$(shell dpkg-buildflags --get LDFLAGS))
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
diff --git a/debian/rules b/debian/rules
index 120dc6e..69fb921 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ OPT_FLAVORS := $(filter-out static shared, $(FLAVORS))
 $(info FLAVORS = $(FLAVORS))
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
 $(info CFLAGS = $(CFLAGS))
+$(info CPPFLAGS = $(CPPFLAGS))
 $(info LDFLAGS = $(LDFLAGS))
 
 define dh_install_file_opt_flavor
@@ -44,7 +45,7 @@ configure-%: configure-stamp-%
 configure-stamp-%:
 	dh_testdir
 	mkdir -p debian-$*
-	cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
+	cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
 		$($*_build_confflags) $(extra_$*_build_confflags)
 	touch $@
 

-- 
Libav/FFmpeg packaging