bin/module-deps.pl | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 68242e8c299b721f6e8e25608fab1fba4d011c96
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 11 15:09:31 2014 +0200
Do not mishandle further libs without dependencies
...besides sal/Library_sal.mk, like i18npool/Library_collator_data.mk.
Change-Id: I2d86540bd8123410972496047fdb59ebcf35968f
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index 0520eca..edf597d 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -218,14 +218,18 @@ sub collapse_lib_to_module($)
my %unknown_libs;
for my $name (sort keys %{$tree}) {
my $result = $tree->{$name};
+ $unknown_libs{$name} = 1 && next if (!grep {/$name/} keys $l2m);
+ $name = $l2m->{$name};
# sal has no dependencies, take care of it
# otherwise it doesn't have target key
if (!@{$result->{deps}}) {
- $digraph{$name}{target} = $result->{target};
+ if (!exists($digraph{$name})) {
+ my @empty;
+ $digraph{$name}{deps} = \@empty;
+ $digraph{$name}{target} = $result->{target};
+ }
}
for my $dep (@{$result->{deps}}) {
- $unknown_libs{$name} = 1 && next if (!grep {/$name/} keys $l2m);
- $name = $l2m->{$name};
$dep = $l2m->{$dep};
# ignore: two libraries from the same module depend on each other
next if ($name eq $dep);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
