summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2021-08-25 15:34:58 +0200
committerAndrew Bartlett <abartlet@samba.org>2021-09-02 21:22:17 +0000
commit59ed09928541d40df72592419247add608a54aca (patch)
tree85a8bd7ec2200f3b498897a2c7d376bbc874b659 /buildtools
parente41bc0f43f6d86d554f37881263c43c356994726 (diff)
downloadsamba-59ed09928541d40df72592419247add608a54aca.tar.gz
third_party: Update waf to version 2.0.22
New in waf 2.0.22 * Fix stdin propagation with faulty vcvarsall scripts #2315 * Enable mixing Unix-style paths with destdir on Windows platforms #2337 * Fix shell escaping unit test parameters #2314 * Improve extras/clang_compilation_database and extras/swig compatibility #2336 * Propagate C++ flags to the Cuda compiler in extras/cuda #2311 * Fix detection of Qt 5.0.0 (preparation for Qt6) #2331 * Enable Haxe processing #2308 * Fix regression in MACOSX_DEPLOYMENT_TARGET caused by distutils #2330 * Fix extras/wafcache concurrent trimming issues #2312 * Fix extras/wafcache symlink handling #2327 The import was done like this: ./third_party/waf/update.sh Then changing buildtools/bin/waf and buildtools/wafsamba/wafsamba.py by hand. Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Andreas Schneider <asn@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Thu Sep 2 21:22:17 UTC 2021 on sn-devel-184
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 041450fc131..b0ccb09a877 100755
--- a/buildtools/bin/waf
+++ b/buildtools/bin/waf
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
import os, sys, inspect
-VERSION="2.0.21"
+VERSION="2.0.22"
REVISION="x"
GIT="x"
INSTALL="x"
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 4fe9daf160e..dee007bf84e 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 (0x2001500,):
+if Context.HEXVERSION not in (0x2001600,):
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