mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:11:46 +02:00
use parent-dependencies for all dependencies of a package, not only those which are conditional deendencies (thanks to lars (also for this commit message :P))
fixes bug #4917 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15187 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
8e028d3df0
commit
61c9b8665f
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user