[SCM] libav-extra/master: Set CPPFLAGS separately.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Sun Mar 18 21:23:20 UTC 2012


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

    Set CPPFLAGS separately.
    
    Conflicts:
    
    	debian/rules

diff --git a/debian/confflags b/debian/confflags
index 7fadf4f..038b7c0 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -159,7 +159,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 e80e02d..1457ff4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,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))
 $(info BUILT_USING = $(BUILT_USING))
 
@@ -49,7 +50,7 @@ configure-%: configure-stamp-%
 configure-stamp-%: libav/configure
 	dh_testdir
 	mkdir -p debian-$*
-	cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/libav/configure \
+	cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/libav/configure \
 		$($*_build_confflags) $(extra_$*_build_confflags)
 	touch $@
 

-- 
libav-extra packaging



More information about the pkg-multimedia-commits mailing list