sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

build:wafsamba: Ensure that check_group_ordering can be overridden

Browse Source 
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
This commit is contained in:
Thomas Nagy 2015-11-19 01:55:43 +01:00 committed by Andrew Bartlett
parent 735cf0683d
commit 3b2ae078a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildtools/wafsamba/samba_deps.py
View File

@ -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)