setting OPTIMIZE could in theory lead to breakage, so make it v9

diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index a9c7fac1ecc3872f303643d88e4de9e7fb13afdf..722a12a350252adaeb6d7fdb0b4a351cfce33b58 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -46,7 +46,7 @@ sub configure {
        # This prevents  Module::Install from interactive behavior.
        $ENV{PERL_AUTOINSTALL}="--skipdeps";
 
-       if ($ENV{CFLAGS}) {
+       if ($ENV{CFLAGS} && ! compat(8)) {
                push @flags, "OPTIMIZE=$ENV{CFLAGS}";
        }
 

diff --git a/debian/changelog b/debian/changelog
index 1c4f2c94b6791a9c287fc3e15db825fbc2210e1f..c2ec5e0d6700603dafa69f6bbd861f6284cc14bf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debhelper (8.9.8) UNRELEASED; urgency=low
   * Clarify description of dh_auto_* -- params. Closes: #642786
   * Mention in debhelper(7) that buildsystem options are typically passed
     to dh. Closes: #643069
+  * perl_makemaker: Pass CFLAGS to Makefile.PL using OPTIMIZE. Closes: #643702
+    (v9 only)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 12 Sep 2011 13:35:52 -0400