diff options
| author | Thomas Nagy <tnagy@waf.io> | 2015-11-19 01:55:43 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-11-24 08:03:29 +0100 |
| commit | 3b2ae078a56975951997822060e899c497acf62b (patch) | |
| tree | 0265cf89617575f83660e3e65a76c80b06a72c0a /buildtools | |
| parent | 735cf0683dab129950e2ccddea4d1182bbe3bd4e (diff) | |
| download | samba-3b2ae078a56975951997822060e899c497acf62b.tar.gz | |
build:wafsamba: Ensure that check_group_ordering can be overridden
Group ordering verifications are performed by default in Waf 1.8,
so this method will be redundant. The purpose of this change is
to make it easier to disable check_group_ordering as it contains
code that is very specific to Waf 1.5.
Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Nov 24 08:03:29 CET 2015 on sn-devel-104
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 6976a9a81d0..2ffe745b821 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -343,7 +343,7 @@ def check_group_ordering(bld, tgt_list): ret = False return ret - +Build.BuildContext.check_group_ordering = check_group_ordering def show_final_deps(bld, tgt_list): '''show the final dependencies for all targets''' @@ -1140,7 +1140,7 @@ def check_project_rules(bld): debug("deps: check_duplicate_sources: %f" % (time.clock() - tstart)) - if not check_group_ordering(bld, tgt_list): + if not bld.check_group_ordering(tgt_list): Logs.error("Bad group ordering - aborting") sys.exit(1) |