diff options
| -rw-r--r-- | Debian/Debhelper/Buildsystem/qmake.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm index 521013b3..91e817f8 100644 --- 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 faca0dd4..a3a72c7a 100644 --- 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 |