aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-02-01 01:16:01 +0000
committerLars-Peter Clausen <lars@metafoo.de>2009-02-01 01:16:01 +0000
commit0597dd6bd892df71a32f4f62888879a9c0fe4caf (patch)
tree53028a446ceb18311bf8a760fb589d47c9b6444d /scripts
parent68461aeb0a3e0412d4ca91226810ea3e2c933bb6 (diff)
downloadupstream-0597dd6bd892df71a32f4f62888879a9c0fe4caf.tar.gz
upstream-0597dd6bd892df71a32f4f62888879a9c0fe4caf.tar.bz2
upstream-0597dd6bd892df71a32f4f62888879a9c0fe4caf.zip
Reset condition for each dependeny when generating mconf files. Previously all
dependencys listed after a conditional dependency had the same condition. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index da29fdd895..fa30556205 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -375,7 +375,7 @@ sub mconf_depends {
my $res;
my $dep = shift;
my $seen = shift;
- my $condition = shift;
+ my $parent_condition = shift;
$dep or $dep = {};
$seen or $seen = {};
@@ -386,11 +386,12 @@ sub mconf_depends {
$depend =~ s/^([@\+]+)//;
my $flags = $1;
my $vdep;
+ my $condition;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
- if ($condition) {
- $condition = "$condition && $1";
+ if ($parent_condition) {
+ $condition = "$parent_condition && $1";
} else {
$condition = $1;
}