summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorUri Simchoni <uri@samba.org>2019-10-07 00:36:42 +0300
committerUri Simchoni <uri@samba.org>2019-10-20 12:06:30 +0000
commit09e282ec8173f2935bdb579e0396f269ce712e0d (patch)
tree771e66bf05fd1c6a724cb7d67800ef90ac48939f /buildtools
parent0afd655e80262ea8505a2e6d0dd9cc453fbdfd8c (diff)
downloadsamba-09e282ec8173f2935bdb579e0396f269ce712e0d.tar.gz
waf: upgrade to 2.0.18
This is required to get the new test_args parameter to conf.check, which facilitates passing arguments to configuration test programs. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13846 Signed-off-by: Uri Simchoni <uri@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
-rwxr-xr-xbuildtools/bin/waf2
-rw-r--r--buildtools/wafsamba/wafsamba.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/bin/waf b/buildtools/bin/waf
index 8413f2332b7..11ce8e7480a 100755
--- a/buildtools/bin/waf
+++ b/buildtools/bin/waf
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
import os, sys, inspect
-VERSION="2.0.17"
+VERSION="2.0.18"
REVISION="x"
GIT="x"
INSTALL="x"
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 76d65ebfcb6..205d5b4ac32 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -38,7 +38,7 @@ LIB_PATH="shared"
os.environ['PYTHONUNBUFFERED'] = '1'
-if Context.HEXVERSION not in (0x2001100,):
+if Context.HEXVERSION not in (0x2001200,):
Logs.error('''
Please use the version of waf that comes with Samba, not
a system installed version. See http://wiki.samba.org/index.php/Waf