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-a3cf2f4a3e73master
parent
68461aeb0a
commit
0597dd6bd8
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue