From e7f5f747e04176bda1d0e353eee3e0b5445b70f8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Apr 2012 16:54:42 -0400 Subject: [PATCH] cmake: Only pass CPPFLAGS in CFLAGS in v9. --- Debian/Debhelper/Buildsystem/cmake.pm | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index 98029ef..f318b44 100644 --- a/Debian/Debhelper/Buildsystem/cmake.pm +++ b/Debian/Debhelper/Buildsystem/cmake.pm @@ -44,7 +44,7 @@ sub configure { push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON"; # CMake doesn't respect CPPFLAGS, see #653916. - if ($ENV{CPPFLAGS}) { + if ($ENV{CPPFLAGS} && ! compat(8)) { $ENV{CFLAGS} .= ' ' . $ENV{CPPFLAGS}; $ENV{CXXFLAGS} .= ' ' . $ENV{CPPFLAGS}; } diff --git a/debian/changelog b/debian/changelog index 86d4565..7d85a5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +debhelper (9.20120418) unstable; urgency=low + + * cmake: Only pass CPPFLAGS in CFLAGS in v9. + + -- Joey Hess Tue, 17 Apr 2012 16:54:39 -0400 + debhelper (9.20120417) unstable; urgency=low * cmake: Pass CPPFLAGS in CFLAGS. Closes: #668813 -- 2.39.2