only check prerequisites of actually selected packages
only check prerequisites of actually selected packages

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5055 3c298f89-4303-0410-b956-a3cf2f4a3e73

--- a/package/Makefile
+++ b/package/Makefile
@@ -11,7 +11,7 @@
 include $(TOPDIR)/.pkgdeps
 include $(TOPDIR)/host.mk
 
-PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-prereq))
+PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))

--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -14,7 +14,6 @@
 my %conf;
 my %pkg;
 my %prereq;
-my $prereq;
 my %dep;
 my %options;
 my $opt;
@@ -36,8 +35,7 @@
 		$pkg{$name}->{src} = $src;
 	};
 	$line =~ /^Prereq-Check:/ and !defined $prereq{$src} and do {
-		$prereq{$src} = 1;
-		$prereq .= "package-prereq += $src\n";
+		$pkg{$name}->{prereq} = 1;
 	};
 	$line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
 		$pkg{$name}->{depends} ||= [];
@@ -52,11 +50,19 @@
 $line="";
 
 foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
+	my $config;
+	
 	if ($options{SDK}) {
-		$conf{$pkg{$name}->{src}} or print "package-m += $pkg{$name}->{src}\n";
-		$conf{$pkg{$name}->{src}} = 1;
+		$conf{$pkg{$name}->{src}} or do {
+			$config = 'm';
+			$conf{$pkg{$name}->{src}} = 1;
+		};
 	} else {
-		print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+		$config = "\$(CONFIG_PACKAGE_$name)"
+	}
+	if ($config) {
+		print "package-$config += $pkg{$name}->{src}\n";
+		$pkg{$name}->{prereq} and print "prereq-$config += $pkg{$name}->{src}\n";
 	}
 
 	my $hasdeps = 0;
@@ -81,6 +87,6 @@
 }
 
 if ($line ne "") {
-	print "\n$line\n$prereq";
+	print "\n$line";
 }
 

comments