From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 13 Feb 2011 02:52:22 +0000 (+0000)
Subject: metadata: fix handling of multiple build dependencies with different conditions
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=e10871bad01240282f76046fa7606b8fe94cfba4;p=openwrt.git

metadata: fix handling of multiple build dependencies with different conditions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25505 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 9f06299aad..7c60efbf4a 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -738,7 +738,7 @@ sub gen_package_mk() {
 				if ($idx) {
 					my $depline;
 					next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
-					next if $dep{$pkg->{src}."->".$idx};
+					next if $dep{$condition.":".$pkg->{src}."->".$idx};
 					next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
 					my $depstr;