From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 4 Aug 2013 12:17:26 +0000 (+0000)
Subject: build: process transitive dependencies after local dependencies
X-Git-Tag: reboot~9579
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d3067892b797948052b30d75029c3b99f4870fc;p=oweals%2Fopenwrt.git

build: process transitive dependencies after local dependencies

This improves duplicate dependency detection

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37679
---

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 28ddefcd9c..498456ea4d 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -442,6 +442,7 @@ sub mconf_depends {
 	my $parent_condition = shift;
 	$dep or $dep = {};
 	$seen or $seen = {};
+	my @t_depends;
 
 	$depends or return;
 	my @depends = @$depends;
@@ -475,7 +476,7 @@ sub mconf_depends {
 				# 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($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition);
+				$package{$depend} and push @t_depends, [ $package{$depend}->{depends}, $condition ];
 
 				$m = "select";
 				next if $only_dep;
@@ -492,6 +493,11 @@ sub mconf_depends {
 		}
 		$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
 	}
+
+	foreach my $tdep (@t_depends) {
+		mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]);
+	}
+
 	foreach my $depend (keys %$dep) {
 		my $m = $dep->{$depend};
 		$res .= "\t\t$m $depend\n";