[jhbuild] Pass -j1 when supports-parallel-builds="no"



commit 257db7dcd74ed7b8263ba5b8e62a93500db4ae52
Author: Adam Dingle <adam yorba org>
Date:   Sun May 26 10:43:56 2013 -0400

    Pass -j1 when supports-parallel-builds="no"
    
    https://bugzilla.gnome.org/show_bug.cgi?id=701051

 jhbuild/modtypes/__init__.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 58ca6a1..06ed13b 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -516,8 +516,8 @@ class MakeModule(Package):
             if ' -j' not in makeargs:
                 arg = '-j %s' % (buildscript.config.jobs, )
                 makeargs = makeargs + ' ' + arg
-        elif not self.supports_parallel_build and ' -j' in makeargs:
-            makeargs = re.sub(r'-j\w*\d+', '', makeargs)
+        elif not self.supports_parallel_build:
+            makeargs = re.sub(r'-j\w*\d+', '', makeargs) + ' -j 1'
         return self.eval_args(makeargs).strip()
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]