diff options
| author | David Mulder <dmulder@suse.com> | 2020-08-24 13:12:46 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2020-09-07 12:02:15 +0000 |
| commit | 5fc3a71d0f54b176d3cb2e399718d0468507e797 (patch) | |
| tree | 041a71290be12b6beb3f3807b56b3553285e3858 /buildtools | |
| parent | 896b7bbcf25b336a970441396d8e60c3d115a1b9 (diff) | |
| download | samba-5fc3a71d0f54b176d3cb2e399718d0468507e797.tar.gz | |
waf: upgrade to 2.0.20
This contain an important change:
"Fix gccdeps.scan() returning nodes that no longer exist on disk."
https://gitlab.com/ita1024/waf/-/merge_requests/2293
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'buildtools')
| -rwxr-xr-x | buildtools/bin/waf | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_waf18.py | 3 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/buildtools/bin/waf b/buildtools/bin/waf index 11ce8e7480a..feabe25d131 100755 --- a/buildtools/bin/waf +++ b/buildtools/bin/waf @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. import os, sys, inspect -VERSION="2.0.18" +VERSION="2.0.20" REVISION="x" GIT="x" INSTALL="x" diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 4afee249d33..0587f525aff 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -459,7 +459,7 @@ def RECURSE(ctx, directory): return visited_dirs.add(key) relpath = os.path.relpath(abspath, ctx.path.abspath()) - if ctxclass in ['tmp', 'OptionsContext', 'ConfigurationContext', 'BuildContext']: + if ctxclass in ['tmp', 'OptionsContext', 'ConfigurationContext', 'BuildContext', 'ClangDbContext']: return ctx.recurse(relpath) if 'waflib.extras.compat15' in sys.modules: return ctx.recurse(relpath) diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py index c0bb6bfcf55..ecf3891f175 100644 --- a/buildtools/wafsamba/samba_waf18.py +++ b/buildtools/wafsamba/samba_waf18.py @@ -5,6 +5,7 @@ from waflib import Build, Configure, Node, Utils, Options, Logs, TaskGen from waflib import ConfigSet from waflib.TaskGen import feature, after from waflib.Configure import conf, ConfigurationContext +from waflib.extras import clang_compilation_database from waflib.Tools.flex import decide_ext @@ -37,7 +38,7 @@ TaskGen.declare_chain( ) -for y in (Build.BuildContext, Build.CleanContext, Build.InstallContext, Build.UninstallContext, Build.ListContext): +for y in (Build.BuildContext, Build.CleanContext, Build.InstallContext, Build.UninstallContext, Build.ListContext, clang_compilation_database.ClangDbContext): class tmp(y): variant = 'default' diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 7827d374654..9f6ee4f5c7f 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 (0x2001200,): +if Context.HEXVERSION not in (0x2001400,): 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 |