X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fgen_deps.pl;h=0cdcc97a14789f6f3cf215ca4e0b8fd24bb4ed3b;hb=524267210bd9106f51e233e457cad3bf6461d2a7;hp=ef49fa3f418cb9b9a251d4ce33019fb1453c232b;hpb=95bdcf394e439d688a5290a26a15e0bc31144f91;p=openwrt.git

diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index ef49fa3f41..0cdcc97a14 100755
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -1,10 +1,25 @@
 #!/usr/bin/perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 use strict;
 
 my $name;
 my $src;
 my $makefile;
+my %conf;
 my %pkg;
+my %dep;
+my %options;
+my $opt;
+
+while ($opt = shift @ARGV) {
+	$opt =~ /^-s/ and $options{SDK} = 1;
+}
 
 my $line;
 while ($line = <>) {
@@ -18,22 +33,39 @@ 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 "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+	if ($options{SDK}) {
+		$conf{$pkg{$name}->{src}} or print "package-m += $pkg{$name}->{src}\n";
+		$conf{$pkg{$name}->{src}} = 1;
+	} else {
+		print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+	}
 
 	my $hasdeps = 0;
 	my $depline = "";
 	foreach my $dep (@{$pkg{$name}->{depends}}) {
-	        if (defined $pkg{$dep}->{src} && $pkg{$name}->{src} ne $pkg{$dep}->{src}) {
-			$depline .= " $pkg{$dep}->{src}-compile";
+		my $idx;
+		if (defined $pkg{$dep}->{src}) {
+			($pkg{$name}->{src} ne $pkg{$dep}->{src}) and $idx = $pkg{$dep}->{src};
+		} elsif (defined($pkg{$dep}) && !$options{SDK}) {
+			$idx = $dep;
+		}
+		if ($idx) {
+			next if $dep{$pkg{$name}->{src}."->".$idx};
+			$depline .= " $idx\-compile";
+			$dep{$pkg{$name}->{src}."->".$idx} = 1;
 		}
 	}
 	if ($depline ne "") {