[SCM] xvidcore/master: Refrain from mangling CFLAGS in debian/confflags, move the remainder of this file into debian/rules

[fabian at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1b0ffceb8ea4a04b6b0613b7132ca202bd49343e
Author: Fabian Greffrath <fabian at debian.org>
Date:   Mon Jun 29 09:42:22 2015 +0200

    Refrain from mangling CFLAGS in debian/confflags, move the remainder of this file into debian/rules

diff --git a/debian/confflags b/debian/confflags
deleted file mode 100644
index 89ee48c..0000000
--- a/debian/confflags
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- mode: makefile -*-
-# vim:syntax=make
-
-# Set hardened CFLAGS
-HARDENED_CFLAGS = $(shell dpkg-buildflags --get CFLAGS 2>/dev/null | sed -e 's/-g\|-O2//g')
-HARDENED_CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
-ifeq (,$(HARDENED_CFLAGS))
-  # Handle case for versions of Debian/Ubuntu that have dpkg-dev (<< 1.15.7).
-  HARDENED_CFLAGS = -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2
-endif
-
-# Set CFLAGS from DEB_CFLAGS if defined, otherwise let xvidcore's build system
-# set CFLAGS to use.
-DEFAULT_CFLAGS = -Wall -O3 -fstrength-reduce -finline-functions -ffast-math \
-                 -fomit-frame-pointer $(HARDENED_CFLAGS)
-export CFLAGS = $(or $(DEB_CFLAGS),$(DEFAULT_CFLAGS))
-
-export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-export DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-# Explicitely disable Altivec support on powerpc until we introduce flavours
-ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
-	confflags += --disable-assembly
-endif
-
-# Explicitely disable yasm support on kfreebsd, it's broken on 64bit;
-# see: http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/xvid/Makefile?rev=1.36
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-	confflags += --disable-assembly
-endif
diff --git a/debian/rules b/debian/rules
index eb77258..03d07f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,20 @@
 #!/usr/bin/make -f
 
-include debian/confflags
+export DEB_CFLAGS_MAINT_APPEND += $(shell dpkg-buildflags --get CPPFLAGS)
+
+export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+# Explicitely disable Altivec support on powerpc until we introduce flavours
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
+	confflags += --disable-assembly
+endif
+
+# Explicitely disable yasm support on kfreebsd, it's broken on 64bit;
+# see: http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/xvid/Makefile?rev=1.36
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+	confflags += --disable-assembly
+endif
 
 %:
 	dh $@ --sourcedirectory=build/generic \

-- 
xvidcore packaging