diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-21 17:45:23 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-21 19:03:27 +1100 |
| commit | dc729c62eaadff081dea28a4f8769af45c83c4cf (patch) | |
| tree | 01bc3842141b5ba0931f5236149510d3b74016e1 | |
| parent | 7ffb781e81ef15bed730a8c2c3ddc4280485ee9f (diff) | |
| download | samba-dc729c62eaadff081dea28a4f8769af45c83c4cf.tar.gz samba-dc729c62eaadff081dea28a4f8769af45c83c4cf.tar.bz2 samba-dc729c62eaadff081dea28a4f8769af45c83c4cf.zip | |
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
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 4 |
1 files changed, 3 insertions, 1 deletions
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': |