aboutsummaryrefslogtreecommitdiffstats
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
commit8d0cf8fde2311e3c3343648cacbce274a26fcc3d (patch)
tree2888cdcd51b1420736ede2f9ee649e80a6109033
parente6a0ebc98966a2ed74b745993c7b72d8ee59a282 (diff)
downloadupstream-8d0cf8fde2311e3c3343648cacbce274a26fcc3d.tar.gz
upstream-8d0cf8fde2311e3c3343648cacbce274a26fcc3d.tar.bz2
upstream-8d0cf8fde2311e3c3343648cacbce274a26fcc3d.zip
metadata: fix handling of multiple build dependencies with different conditions
SVN-Revision: 25505
-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;