Split CFLAGS into words when building wrapper. Closes: #682237

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index c39aa2ef7d678207ef86c938baef3f7af1933c30..769540d29ac3de34715436ead21416747d3b09b4 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -214,7 +214,7 @@ $set_background_command
 EOF
 
        my @cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
-       push @cc, possibly_foolish_untaint($ENV{CFLAGS}) if exists $ENV{CFLAGS};
+       push @cc, split(' ', possibly_foolish_untaint($ENV{CFLAGS})) if exists $ENV{CFLAGS};
        if (system(@cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
                #translators: The parameter is a C filename.
                error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));

diff --git a/debian/changelog b/debian/changelog
index a809950fb4f5bb73764ffdb77c7e27e30e75f86f..4d6b03dc9b0f20ce1233b21a986da003775b4b7b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,9 @@ ikiwiki (3.20120629.2+deb7u2) UNRELEASED; urgency=medium
     adjusted for compatibility with the older pkg-perl-autopkgtest in jessie
     - d/control: add enough build-dependencies to run all tests, except for
       non-git VCSs
+  * Split CFLAGS into words when building wrapper, fixing build-time test
+    failure. Closes: #682237 (patch from Joey Hess, backported from
+    3.20120630)
 
  -- Simon McVittie <smcv@debian.org>  Wed, 11 Jan 2017 15:22:38 +0000