improve dependency handling, fix some package makefile bugs

[openwrt.git] / scripts / gen_deps.pl

diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index d4b6c76..d75f06d 100755 (executable)
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -5,6 +5,7 @@ my $name;
 my $src;
 my $makefile;
 my %pkg;
+my %dep;
 
 my $line;
 while ($line = <>) {
@@ -18,17 +19,41 @@ while ($line = <>) {
                defined $pkg{$name} or $pkg{$name} = {};
                $pkg{$name}->{src} = $src;
        };
-       $line =~ /^Depends: \s*(.+)\s*$/ and do {
-               my @dep = split /,\s*/, $1;
-               $pkg{$name}->{depends} = \@dep;
+       $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
+               $pkg{$name}->{depends} ||= [];
+               foreach my $v (split /\s+/, $2) {
+                       next if $v =~ /^@/;
+                       $v =~ s/^\+//;
+                       push @{$pkg{$name}->{depends}}, $v;
+               }
        };
 }
 
+$line="";
+
 foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
-       print "$name: ";
+       print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+
+       my $hasdeps = 0;
+       my $depline = "";
        foreach my $dep (@{$pkg{$name}->{depends}}) {
-               print "$dep ";
+               my $idx;
+               if (defined $pkg{$dep}->{src} && $pkg{$name}->{src} ne $pkg{$dep}->{src}) {
+                       $idx = $pkg{$dep}->{src};
+               } elsif (defined $pkg{$dep}) {
+                       $idx = $dep;
+               }
+               if ($idx) {
+                       next if $dep{$pkg{$name}->{src}."->".$idx};
+                       $depline .= " $idx\-compile";
+                       $dep{$pkg{$name}->{src}."->".$idx} = 1;
+               }
+       }
+       if ($depline ne "") {
+               $line .= "$pkg{$name}->{src}-compile: $depline\n";
        }
-       print "\n\tmake -C ".$pkg{$name}->{src}."\n";
-       print "\n";
+}
+
+if ($line ne "") {
+       print "\n$line";
 }