[jhbuild] Allow passing makeargs to Ninja-based modules

[Sébastien Wilmet <swilmet src gnome org>]

commit f8c05196933f8c1010c5b9d163567c10c990dda7
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Nov 23 15:20:07 2017 +0000

    Allow passing makeargs to Ninja-based modules
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782320

 jhbuild/modtypes/cmake.py |    3 ++-
 jhbuild/modtypes/meson.py |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index d7868db..9c68148 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -134,7 +134,8 @@ class CMakeModule(MakeModule, DownloadableModule):
         builddir = self.get_builddir(buildscript)
         if self.use_ninja:
             self.ensure_ninja_binary()
-            buildscript.execute(self.ninja_binary, cwd=builddir, extra_env=self.extra_env)
+            ninja_cmd = '{} {}'.format(self.ninja_binary, self.get_makeargs(buildscript))
+            buildscript.execute(ninja_cmd, cwd=builddir, extra_env=self.extra_env)
         else:
             self.make(buildscript)
     do_build.depends = [PHASE_CONFIGURE]
diff --git a/jhbuild/modtypes/meson.py b/jhbuild/modtypes/meson.py
index 071c912..5285f55 100644
--- a/jhbuild/modtypes/meson.py
+++ b/jhbuild/modtypes/meson.py
@@ -141,7 +141,8 @@ class MesonModule(MakeModule, DownloadableModule):
         buildscript.set_action(_('Building'), self)
         builddir = self.get_builddir(buildscript)
         self.ensure_ninja_binary()
-        buildscript.execute(self.ninja_binary, cwd=builddir, extra_env=self.extra_env)
+        ninja_cmd = '{} {}'.format(self.ninja_binary, self.get_makeargs(buildscript))
+        buildscript.execute(ninja_cmd, cwd=builddir, extra_env=self.extra_env)
     do_build.depends = [PHASE_CONFIGURE]
     do_build.error_phases = [PHASE_FORCE_CHECKOUT, PHASE_CONFIGURE]