[SCM] mixxx/master: Append CPPFLAGS to the end of CFLAGS/CXXFLAGS as the buildsystem ignores them.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6bfe2c7281653078ca0b54b435c701cd46a4a0b6
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 29 10:19:41 2012 +0200

    Append CPPFLAGS to the end of CFLAGS/CXXFLAGS as the buildsystem ignores them.
    
    Closes: #674971

diff --git a/debian/rules b/debian/rules
index f4ac423..ec14985 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,10 @@ UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\
 PACKAGE = mixxx
 
 export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+# The build system ignores CPPFLAGS, pass them to CFLAGS/CXXFLAGS to enable
+# the missing (hardening) flags.
+export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

-- 
mixxx packaging