aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/metadata.pl
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-13 02:52:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-13 02:52:22 +0000
commitf9db725f5c5e7a01e34d1d633410823c4f8efba0 (patch)
tree201dce8b3e9fb4bbda9b526561a4644e7918f7f8 /scripts/metadata.pl
parentd088b06f90d6a8dfd1986ce50926c4e162c87bae (diff)
downloadmaster-187ad058-f9db725f5c5e7a01e34d1d633410823c4f8efba0.tar.gz
master-187ad058-f9db725f5c5e7a01e34d1d633410823c4f8efba0.tar.bz2
master-187ad058-f9db725f5c5e7a01e34d1d633410823c4f8efba0.zip
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
Diffstat (limited to 'scripts/metadata.pl')
-rwxr-xr-xscripts/metadata.pl2
1 files changed, 1 insertions, 1 deletions
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;