KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reset condition for each dependeny when generating mconf files. Previously all dependencys listed after a conditional dependency had the same condition.

Browse source 
SVN-Revision: 14335
This commit is contained in:
Lars-Peter Clausen 2009-02-01 01:16:01 +00:00
parent 5901305e2b
commit f42bf4d6cf
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/metadata.pl
View file

@ -375,7 +375,7 @@ sub mconf_depends {
my $res; my $res;
my $dep = shift; my $dep = shift;
my $seen = shift; my $seen = shift;
my $condition = shift; my $parent_condition = shift;
$dep or $dep = {}; $dep or $dep = {};
$seen or $seen = {}; $seen or $seen = {};
@ -386,11 +386,12 @@ sub mconf_depends {
$depend =~ s/^([@\+]+)//; $depend =~ s/^([@\+]+)//;
my $flags = $1; my $flags = $1;
my $vdep; my $vdep;
my $condition;
if ($depend =~ /^(.+):(.+)$/) { if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") { if ($1 ne "PACKAGE_$pkgname") {
if ($condition) { if ($parent_condition) {
$condition = "$condition && $1"; $condition = "$parent_condition && $1";
} else { } else {
$condition = $1; $condition = $1;
} }