From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 13 Feb 2011 02:52:22 +0000 (+0000)
Subject: metadata: fix handling of multiple build dependencies with different conditions
X-Git-Tag: reboot~17580
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8d0cf8fde2311e3c3343648cacbce274a26fcc3d;p=openwrt%2Fstaging%2Flynxis.git

metadata: fix handling of multiple build dependencies with different conditions

SVN-Revision: 25505
---

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;