[jhbuild] Respect non-parallelable modules when makeargs='-j 4' (GNOME bug 670213)
- From: Craig Keogh <cskeogh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Respect non-parallelable modules when makeargs='-j 4' (GNOME bug 670213)
- Date: Mon, 27 Aug 2012 12:37:36 +0000 (UTC)
commit 881cd0103aa58199c5dfa1b707011f84ad0c4735
Author: Craig Keogh <cskeogh adam com au>
Date: Fri Aug 24 15:57:20 2012 +0930
Respect non-parallelable modules when makeargs='-j 4' (GNOME bug 670213)
jhbuild/modtypes/__init__.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index da95e15..321d5aa 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -28,6 +28,7 @@ __all__ = [
]
import os
+import re
import shutil
import logging
@@ -489,6 +490,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)
return self.eval_args(makeargs).strip()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]