projects
/
openwrt
/
staging
/
rmilecki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6a0ebc
)
metadata: fix handling of multiple build dependencies with different conditions
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 13 Feb 2011 02:52:22 +0000
(
02:52
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 13 Feb 2011 02:52:22 +0000
(
02:52
+0000)
SVN-Revision: 25505
scripts/metadata.pl
patch
|
blob
|
history
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index 9f06299aadac13a6ef8a2998e29dac1480d68148..7c60efbf4a0ad307b9d6f600d79a893bbe89989d 100755
(executable)
--- 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;