projects
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05d8c72
)
metadata: fix handling of multiple build dependencies with different conditions
author
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 13 Feb 2011 02:52:22 +0000
(
02:52
+0000)
committer
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 13 Feb 2011 02:52:22 +0000
(
02:52
+0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25505
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
scripts/metadata.pl
patch
|
blob
|
history
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index
9f06299
..
7c60efb
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;