From dc729c62eaadff081dea28a4f8769af45c83c4cf Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Oct 2010 17:45:23 +1100 Subject: waf: loosen the restriction on depending on python libs the pidl generated python code can generate dependencies between two python modules, so we have to allow this for now --- buildtools/wafsamba/samba_deps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'buildtools/wafsamba/samba_deps.py') diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index c2b95bb1ff..a89c3e8ca3 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -439,7 +439,9 @@ def build_direct_deps(bld, tgt_list): sys.exit(1) if targets[d] in [ 'EMPTY', 'DISABLED' ]: continue - if targets[d] == 'PYTHON': + if targets[d] == 'PYTHON' and targets[t.sname] != 'PYTHON' and t.sname.find('.objlist') == -1: + # this check should be more restrictive, but for now we have pidl-generated python + # code that directly depends on other python modules Logs.error('ERROR: Target %s has dependency on python module %s' % (t.sname, d)) sys.exit(1) if targets[d] == 'SYSLIB': -- cgit