[SCM] Samba Shared Repository - branch v4-8-test updated

[Karolin Seeger]

The branch, v4-8-test has been updated
       via  b29d90f wafsamba: Fix 'make -j<jobs>'
      from  3ea96a2 krb5-samba: interdomain trust uses different salt principal

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-8-test


- Log -----------------------------------------------------------------
commit b29d90ffa4408b416a76550f9ab617b6e5303313
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Sep 6 12:40:10 2018 +0200

    wafsamba: Fix 'make -j<jobs>'
    
    Currently only 'make -j' enables parallel builds and e.g. 'make -j4'
    results in no parallel compile jobs at all.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13606
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Sep  7 20:24:46 CEST 2018 on sn-devel-144
    
    (cherry picked from commit 70169d4789fe8b2ee4efe5e88eeaa80e1a641b32)
    
    Autobuild-User(v4-8-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-8-test): Mon Sep 10 16:45:04 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_utils.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 0f95c12..c20f61e 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -467,6 +467,7 @@ def CHECK_MAKEFLAGS(bld):
     if makeflags is None:
         return
     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 +490,21 @@ def CHECK_MAKEFLAGS(bld):
             setattr(Options.options, opt[0:loc], opt[loc+1:])
         elif opt[0] != '-':
             for v in opt:
-                if v == 'j':
+                if re.search(r'j[0-9]*$', v):
                     jobs_set = True
+                    jobs = opt.strip('j')
                 elif v == 'k':
                     Options.options.keep = True
-        elif opt == '-j':
+        elif re.search(r'-j[0-9]*$', opt):
             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
+    elif jobs_set and jobs:
+        Options.options.jobs = int(jobs)
 
 Build.BuildContext.CHECK_MAKEFLAGS = CHECK_MAKEFLAGS
 


-- 
Samba Shared Repository