Also include CFLAGS in ld line for perl. Closes: #662666

diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 35a23d675b12bd620855206d38ee9eb768ad727a..671bca5713f919b046a8c5f2020c0f8a5790d43e 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -46,7 +46,7 @@ sub configure {
                push @flags, "config=optimize=$ENV{CFLAGS} $ENV{CPPFLAGS}";
        }
        if ($ENV{LDFLAGS} && ! compat(8)) {
-               push @flags, "config=ld=$Config{ld} $ENV{LDFLAGS}";
+               push @flags, "config=ld=$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}";
        }
        $this->do_perl("Build.PL", "installdirs=vendor", @flags, @_);
 }

diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 342e0eb8e1e0026b3d6307e0181824b54169fd74..60cda3d02e0a2b1aeb7f00a237fc56695d0e61d8 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -51,7 +51,7 @@ sub configure {
                push @flags, "OPTIMIZE=$ENV{CFLAGS} $ENV{CPPFLAGS}";
        }
        if ($ENV{LDFLAGS} && ! compat(8)) {
-               push @flags, "LD=$Config{ld} $ENV{LDFLAGS}";
+               push @flags, "LD=$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}";
        }
 
        $this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor",

diff --git a/debian/changelog b/debian/changelog
index e0df68e7192646a3aa7812860d3284c292debc02..010ebb5beaa2919f62097ce84ab00316f0a6a497 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (9.20120312) UNRELEASED; urgency=low
+
+  * Also include CFLAGS in ld line for perl. Closes: #662666
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 13 Mar 2012 14:26:24 -0400
+
 debhelper (9.20120311) unstable; urgency=low
 
   * dh_auto_install: Set AM_UPDATE_INFO_DIR=no to avoid automake