CVS commit: pkgsrc/net/samba4

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sat Jun 22 13:27:12 UTC 2019

Modified Files:
        pkgsrc/net/samba4: distinfo
Added Files:
        pkgsrc/net/samba4/patches: patch-buildtools_wafsamba_samba__utils.py

Log Message:
Fixes a build failure when the letter 'j' appears in MAKEFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__utils.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.30 pkgsrc/net/samba4/distinfo:1.31
--- pkgsrc/net/samba4/distinfo:1.30     Wed Jun 19 21:22:59 2019
+++ pkgsrc/net/samba4/distinfo  Sat Jun 22 13:27:12 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2019/06/19 21:22:59 adam Exp $
+$NetBSD: distinfo,v 1.31 2019/06/22 13:27:12 jmcneill Exp $
 
 SHA1 (samba-4.10.5.tar.gz) = 9444a1a0cafd2c734eab39d76908c5344421df99
 RMD160 (samba-4.10.5.tar.gz) = c6ebda08f6dba92446383b18d0f3cce3a2199312
@@ -7,6 +7,7 @@ Size (samba-4.10.5.tar.gz) = 18290612 by
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 0f9ca14e3a77d7dfad06aa8c4d2de2f6cc3c0646
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = a7cc41a55ce032c3fe1e0b660f88fa7871710e0e
+SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
 SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
 SHA1 (patch-docs-xml_wscript__build) = 5aa5cbf61882604b7ec9d19f0cd1537a23705ad0
 SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4

Added files:

Index: pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__utils.py
diff -u /dev/null pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__utils.py:1.1
--- /dev/null   Sat Jun 22 13:27:12 2019
+++ pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__utils.py Sat Jun 22 13:27:12 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-buildtools_wafsamba_samba__utils.py,v 1.1 2019/06/22 13:27:12 jmcneill Exp $
+
+Fixes a build failure when the letter 'j' appears in MAKEFLAGS.
+
+--- buildtools/wafsamba/samba_utils.py.orig    2019-03-21 10:12:32.000000000 +0000
++++ buildtools/wafsamba/samba_utils.py
+@@ -519,10 +519,7 @@ def CHECK_MAKEFLAGS(options):
+             setattr(options, opt[0:loc], opt[loc+1:])
+         elif opt[0] != '-':
+             for v in opt:
+-                if re.search(r'j[0-9]*$', v):
+-                    jobs_set = True
+-                    jobs = opt.strip('j')
+-                elif v == 'k':
++                if v == 'k':
+                     options.keep = True
+         elif re.search(r'-j[0-9]*$', opt):
+             jobs_set = True