Pass CPPFLAGS to qmake. Closes: #646129 Thanks, Felix Geyert

diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm
index 521013b350752e1a230ede333ce57d5c85e73424..91e817f8967133cfdd894a12360977f568ddb495 100644 (file)
--- a/Debian/Debhelper/Buildsystem/qmake.pm
+++ b/Debian/Debhelper/Buildsystem/qmake.pm
@@ -54,12 +54,12 @@ sub configure {
        push @options, '-nocache';
 
        if ($ENV{CFLAGS}) {
-               push @flags, "QMAKE_CFLAGS_RELEASE=$ENV{CFLAGS}";
-               push @flags, "QMAKE_CFLAGS_DEBUG=$ENV{CFLAGS}";
+               push @flags, "QMAKE_CFLAGS_RELEASE=$ENV{CFLAGS} $ENV{CPPFLAGS}";
+               push @flags, "QMAKE_CFLAGS_DEBUG=$ENV{CFLAGS} $ENV{CPPFLAGS}";
        }
        if ($ENV{CXXFLAGS}) {
-               push @flags, "QMAKE_CXXFLAGS_RELEASE=$ENV{CXXFLAGS}";
-               push @flags, "QMAKE_CXXFLAGS_DEBUG=$ENV{CXXFLAGS}";
+               push @flags, "QMAKE_CXXFLAGS_RELEASE=$ENV{CXXFLAGS} $ENV{CPPFLAGS}";
+               push @flags, "QMAKE_CXXFLAGS_DEBUG=$ENV{CXXFLAGS} $ENV{CPPFLAGS}";
        }
        if ($ENV{LDFLAGS}) {
                push @flags, "QMAKE_LFLAGS_RELEASE=$ENV{LDFLAGS}";

diff --git a/debian/changelog b/debian/changelog
index faca0dd4bf7fb083078d535274af512f0c4b7f8e..a3a72c7a6403f06c008d929a3f15aaaefa38d850 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (8.9.13) UNRELEASED; urgency=low
+
+  * Pass CPPFLAGS to qmake. Closes: #646129 Thanks, Felix Geyert
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 08 Dec 2011 18:27:02 -0400
+
 debhelper (8.9.12) unstable; urgency=low
 
   * Debhelper config files may be made executable programs that output the