From e84add587ddbe9c61ffac9aba0ccddaa3f4a7a8f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 6 Sep 2018 13:54:16 +0200 Subject: [PATCH] Update samba-4.9.0rc5-parallel-builds.patch --- samba-4.9.0rc5-parallel-builds.patch | 35 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/samba-4.9.0rc5-parallel-builds.patch b/samba-4.9.0rc5-parallel-builds.patch index 9f8c014..06feaae 100644 --- a/samba-4.9.0rc5-parallel-builds.patch +++ b/samba-4.9.0rc5-parallel-builds.patch @@ -1,4 +1,4 @@ -From 45ff96780bad2c1f806b101ca1211f5c3cef1a4d Mon Sep 17 00:00:00 2001 +From 2f1c716ffef351a56aa5bd0a26c3dd1e34d3283a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 6 Sep 2018 12:40:10 +0200 Subject: [PATCH] wafsamba: Deal with make -j @@ -9,43 +9,44 @@ no parallel jobs at all. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13606 Signed-off-by: Andreas Schneider +Reviewed-by: Alexander Bokovoy --- - buildtools/wafsamba/samba_utils.py | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) + buildtools/wafsamba/samba_utils.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py -index 0f95c125854..ad46005519f 100644 +index 30e99432d1b..fd61b8425d8 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py -@@ -466,7 +466,7 @@ def CHECK_MAKEFLAGS(bld): - makeflags = os.environ.get('MAKEFLAGS') +@@ -448,6 +448,7 @@ def CHECK_MAKEFLAGS(bld): if makeflags is None: return -- jobs_set = False -+ jobs = 1 + jobs_set = False ++ jobs = None # we need to use shlex.split to cope with the escaping of spaces # in makeflags for opt in shlex.split(makeflags): -@@ -489,17 +489,15 @@ def CHECK_MAKEFLAGS(bld): +@@ -470,17 +471,21 @@ def CHECK_MAKEFLAGS(bld): setattr(Options.options, opt[0:loc], opt[loc+1:]) elif opt[0] != '-': for v in opt: - if v == 'j': -- jobs_set = True + if re.search(r'j[0-9]*$', v): -+ jobs = int(opt.strip('j')) + jobs_set = True ++ jobs = opt.strip('j') elif v == 'k': Options.options.keep = True - elif opt == '-j': -- jobs_set = True + elif re.search(r'-j[0-9]*$', opt): -+ jobs = int(opt.strip('-j')) + jobs_set = True ++ jobs = opt.strip('-j') elif opt == '-k': Options.options.keep = True -- if not jobs_set: -- # default to one job -- Options.options.jobs = 1 -+ Options.options.jobs = jobs + if not jobs_set: + # default to one job + Options.options.jobs = 1 ++ elif jobs_set and jobs: ++ Options.options.jobs = int(jobs) Build.BuildContext.CHECK_MAKEFLAGS = CHECK_MAKEFLAGS