X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/697a309ede936843ca8e1510827f0e7544237873..1d1f04a661e82d3ce92c6e32919e46643cba0a2b:/scripts/metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 51dcc425b..bee302012 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use FindBin;
 use lib "$FindBin::Bin";
 use strict;
@@ -161,6 +161,7 @@ sub target_config_features(@) {
 		/ext2/ and $ret .= "\tselect USES_EXT2\n";
 		/tgz/ and $ret .= "\tselect USES_TGZ\n";
 		/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
+		/fpu/ and $ret .= "\tselect HAS_FPU\n";
 	}
 	return $ret;
 }
@@ -379,14 +380,14 @@ sub mconf_depends($$) {
 			$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
 		} else {
 			$flags =~ /\+/ and do {
-				next if $only_dep;
-				$m = "select";
-
 				# Menuconfig will not treat 'select FOO' as a real dependency
 				# thus if FOO depends on other config options, these dependencies
 				# will not be checked. To fix this, we simply emit all of FOO's
 				# depends here as well.
 				$package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep);
+
+				$m = "select";
+				next if $only_dep;
 			};
 			$flags =~ /@/ or $depend = "PACKAGE_$depend";
 		}
@@ -471,7 +472,7 @@ sub print_package_config_category($) {
 
 sub gen_package_config() {
 	parse_package_metadata($ARGV[0]) or exit 1;
-	print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n";
+	print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig;
 	foreach my $preconfig (keys %preconfig) {
 		foreach my $cfg (keys %{$preconfig{$preconfig}}) {
 			my $conf = $preconfig{$preconfig}->{$cfg}->{id};
@@ -494,14 +495,17 @@ EOF
 sub gen_package_mk() {
 	my %conf;
 	my %dep;
+	my %done;
 	my $line;
 
 	parse_package_metadata($ARGV[0]) or exit 1;
 	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
 		my $config;
 		my $pkg = $package{$name};
+		my @srcdeps;
 
 		next if defined $pkg->{vdepends};
+
 		if ($ENV{SDK}) {
 			$conf{$pkg->{src}} or do {
 				$config = 'm';
@@ -515,25 +519,51 @@ sub gen_package_mk() {
 			$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
 		}
 
+		next if $done{$pkg->{src}};
+		$done{$pkg->{src}} = 1;
+
+		foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
+			foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
+				$dep =~ /@/ or do {
+					$dep =~ s/\+//g;
+					push @srcdeps, $dep;
+				};
+			}
+		}
+
 		my $hasdeps = 0;
 		my $depline = "";
-		foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
-			next if $dep =~ /@/;
-			$dep =~ s/\+//;
+		foreach my $deps (@srcdeps) {
 			my $idx;
-			my $pkg_dep = $package{$dep};
-			next if defined $pkg_dep->{vdepends};
+			my $pkg_dep = $package{$deps};
+			my @deps;
 
-			if (defined $pkg_dep->{src}) {
-				($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
-			} elsif (defined($srcpackage{$dep})) {
-				$idx = $subdir{$dep}.$dep;
+			if ($pkg_dep->{vdepends}) {
+				@deps = @{$pkg_dep->{vdepends}};
+			} else {
+				@deps = ($deps);
 			}
-			undef $idx if $idx =~ /^(kernel)|(base-files)$/;
-			if ($idx) {
-				next if $dep{$pkg->{src}."->".$idx};
-				$depline .= " \$(curdir)/$idx/compile";
-				$dep{$pkg->{src}."->".$idx} = 1;
+
+			foreach my $dep (@deps) {
+				$pkg_dep = $package{$deps};
+				if (defined $pkg_dep->{src}) {
+					($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+				} elsif (defined($srcpackage{$dep})) {
+					$idx = $subdir{$dep}.$dep;
+				}
+				undef $idx if $idx =~ /^(kernel)|(base-files)$/;
+				if ($idx) {
+					next if $pkg->{src} eq $pkg_dep->{src};
+					next if $dep{$pkg->{src}."->".$idx};
+					next if $dep{$pkg->{src}."->($dep)".$idx};
+					if ($pkg_dep->{vdepends}) {
+						$depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
+						$dep{$pkg->{src}."->($dep)".$idx} = 1;
+					} else {
+						$depline .= " \$(curdir)/$idx/compile";
+						$dep{$pkg->{src}."->".$idx} = 1;
+					}
+				}
 			}
 		}
 		if ($depline) {