From d975f3d817d2bb831b00c2fbf051d0a04cb415d7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 20 Jul 2012 12:56:57 -0400 Subject: [PATCH] Split CFLAGS into words when building wrapper. Closes: #682237 --- IkiWiki/Wrapper.pm | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index c39aa2ef7..769540d29 100644 --- 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 a809950fb..4d6b03dc9 100644 --- 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 Wed, 11 Jan 2017 15:22:38 +0000 -- 2.39.2