From 3b2ae078a56975951997822060e899c497acf62b Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 19 Nov 2015 01:55:43 +0100 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett Reviewed-by: Michael Adam Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Nov 24 08:03:29 CET 2015 on sn-devel-104 --- buildtools/wafsamba/samba_deps.py | 4 ++-- 1 file 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) -- 2.34.1