summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-15 20:43:31 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:49 +1000
commite502031171013f659405a80490845ef8f95c3c91 (patch)
tree979c4974ffa3e138059886d2adb786454663fc29
parent16fbcb3556607e3fffcefab99cfacea1768a8ead (diff)
downloadsamba-e502031171013f659405a80490845ef8f95c3c91.tar.gz
samba-e502031171013f659405a80490845ef8f95c3c91.tar.bz2
samba-e502031171013f659405a80490845ef8f95c3c91.zip
build: fixed samba_deps.py for python 2.4
-rw-r--r--buildtools/wafsamba/samba_deps.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index d6b68f7c64..cc013eed6b 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -556,6 +556,17 @@ def calculate_final_deps(bld, tgt_list):
break
if not changed:
break
+
+ # we now need to make corrections for any library loops we broke up
+ # any target that depended on the target of the loop and doesn't
+ # depend on the source of the loop needs to get the loop source added
+ for type in ['BINARY']:
+ for t in tgt_list:
+ if t.samba_type != type: continue
+ for loop in loops:
+ if loop in t.final_libs and loops[loop] not in t.final_libs:
+ t.final_libs.add(loops[loop])
+
debug('deps: removed duplicate dependencies')