From e10871bad01240282f76046fa7606b8fe94cfba4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 13 Feb 2011 02:52:22 +0000 Subject: [PATCH] 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 --- scripts/metadata.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 9f06299aa..7c60efbf4 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; -- 2.20.1