[debhelper-devel] [debhelper] 04/04: meson.pm: Set LC_ALL=C.UTF-8 when invoking meson

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 5d09e92295734d7cc553b596088d771ed85d44ae
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Dec 30 20:58:19 2017 +0000

    meson.pm: Set LC_ALL=C.UTF-8 when invoking meson
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog                          |  3 +++
 lib/Debian/Debhelper/Buildsystem/meson.pm | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a35834f..71a6584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ debhelper (11.1) UNRELEASED; urgency=medium
   * dh_missing: Make --list-missing the default in compat 12.
     Thanks to Daniel Leidert and Christian Göttsche for the
     suggestions.  (Closes: #650129, #858834)
+  * meson.pm: Set LC_ALL to C.UTF-8 when invoking meson and
+    debcrossgen (helper tool for cross-building).  Thanks to
+    Jeremy Bicha for the suggestion.  (Closes: #873831)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 17 Dec 2017 07:59:18 +0000
 
diff --git a/lib/Debian/Debhelper/Buildsystem/meson.pm b/lib/Debian/Debhelper/Buildsystem/meson.pm
index dcad89f..482e7e6 100644
--- a/lib/Debian/Debhelper/Buildsystem/meson.pm
+++ b/lib/Debian/Debhelper/Buildsystem/meson.pm
@@ -57,7 +57,11 @@ sub configure {
 				error("Cannot cross-compile: Please use meson (>= 0.42.1) or provide a cross file via DH_MESON_CROSS_FILE");
 			}
 			my $filename = generated_file('_source', 'meson-cross-file.conf');
-			doit({ stdout => '/dev/null' }, $debcrossgen, "-o${filename}");
+			my %options = (
+				stdout => '/dev/null',
+				update_env => { LC_ALL => 'C.UTC-8'},
+			);
+			doit(\%options, $debcrossgen, "-o${filename}");
 			$cross_file = $filename;
 		}
 		if ($cross_file !~ m{^/}) {
@@ -71,7 +75,10 @@ sub configure {
 
 	$this->mkdir_builddir();
 	eval {
-		$this->doit_in_builddir("meson", $this->get_source_rel2builddir(), @opts, @_);
+		my %options = (
+			update_env => { LC_ALL => 'C.UTC-8'},
+		);
+		$this->doit_in_builddir(\%options, "meson", $this->get_source_rel2builddir(), @opts, @_);
 	};
 	if ($@) {
 		if (-e $this->get_buildpath("meson-logs/meson-log.txt")) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git