[SCM] libav/ubuntu: Set CPPFLAGS separately.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 10 10:04:16 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 5d2c75d1b328a4a9f6bfc1f4f9dc74e2f2ad883a
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Fri Mar 2 14:00:15 2012 +0100
Set CPPFLAGS separately.
(cherry picked from commit de1d8cbc73b3fccfd8f8652af5ffe3fcc5a78376)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
diff --git a/debian/confflags b/debian/confflags
index aacb3ff..1c6a609 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -161,7 +161,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 fb03920..10e28f8 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
More information about the pkg-multimedia-commits
mailing list