diff options
Diffstat (limited to 'lib/Debian/Debhelper/Buildsystem/ninja.pm')
| -rw-r--r-- | lib/Debian/Debhelper/Buildsystem/ninja.pm | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/lib/Debian/Debhelper/Buildsystem/ninja.pm b/lib/Debian/Debhelper/Buildsystem/ninja.pm index 5d6c874d..c08ff166 100644 --- a/lib/Debian/Debhelper/Buildsystem/ninja.pm +++ b/lib/Debian/Debhelper/Buildsystem/ninja.pm @@ -30,52 +30,60 @@ sub check_auto_buildable { # This is always called in the source directory, but generally # Ninja files are created (or live) in the build directory. return 1; - } elsif ($step eq "clean" && defined $this->get_builddir() && - $this->check_auto_buildable("configure")) - { - # Assume that the package can be cleaned (i.e. the build directory can - # be removed) as long as it is built out-of-source tree and can be - # configured. This is useful for derivative buildsystems which - # generate Ninja files. - return 1; } return 0; } sub build { my $this=shift; - + my %options = ( + update_env => { + 'LC_ALL' => 'C.UTF-8', + } + ); if (!$dh{QUIET}) { unshift @_, "-v"; } if ($this->get_parallel() > 0) { unshift @_, "-j" . $this->get_parallel(); } - $this->doit_in_builddir($this->{buildcmd}, @_); + $this->doit_in_builddir(\%options, $this->{buildcmd}, @_); } sub test { my $this=shift; - + my %options = ( + update_env => { + 'LC_ALL' => 'C.UTF-8', + } + ); if ($this->get_parallel() > 0) { - $ENV{MESON_TESTTHREADS}=$this->get_parallel(); + $options{update_env}{MESON_TESTTHREADS} = $this->get_parallel(); } - $this->doit_in_builddir($this->{buildcmd}, "test", @_); + $this->doit_in_builddir(\%options, $this->{buildcmd}, "test", @_); } sub install { my $this=shift; my $destdir=shift; - - $ENV{DESTDIR}=$destdir; - $this->doit_in_builddir($this->{buildcmd}, "install", @_); + my %options = ( + update_env => { + 'LC_ALL' => 'C.UTF-8', + 'DESTDIR' => $destdir, + } + ); + $this->doit_in_builddir(\%options, $this->{buildcmd}, "install", @_); } sub clean { my $this=shift; - if (!$this->rmdir_builddir()) { - $this->doit_in_builddir($this->{buildcmd}, "clean", @_); + my %options = ( + update_env => { + 'LC_ALL' => 'C.UTF-8', + } + ); + $this->doit_in_builddir(\%options, $this->{buildcmd}, "clean", @_); } } |