projects
/
openwrt
/
staging
/
nbd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1929c75
)
use parent-dependencies for all dependencies of a package, not only those which are...
author
Mirko Vogt
<mirko@openwrt.org>
Fri, 10 Apr 2009 11:41:18 +0000
(11:41 +0000)
committer
Mirko Vogt
<mirko@openwrt.org>
Fri, 10 Apr 2009 11:41:18 +0000
(11:41 +0000)
SVN-Revision: 15187
scripts/metadata.pl
patch
|
blob
|
history
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index 1c80be4bdbcd0ca908ca7d1194016de63551e71a..1971607ebb6f0576a3e323079b63e76090d563ba 100755
(executable)
--- a/
scripts/metadata.pl
+++ b/
scripts/metadata.pl
@@
-415,12
+415,12
@@
sub mconf_depends {
$depend =~ s/^([@\+]+)//;
my $flags = $1;
my $vdep;
- my $condition;
+ my $condition
= $parent_condition
;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
- if ($
parent_
condition) {
- $condition = "$
parent_
condition && $1";
+ if ($condition) {
+ $condition = "$condition && $1";
} else {
$condition = $1;
}