1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:43:08 +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:
mirko 2009-04-10 11:41:18 +00:00
parent 8e028d3df0
commit 61c9b8665f

View File

@ -415,12 +415,12 @@ sub mconf_depends {
$depend =~ s/^([@\+]+)//; $depend =~ s/^([@\+]+)//;
my $flags = $1; my $flags = $1;
my $vdep; my $vdep;
my $condition; my $condition = $parent_condition;
if ($depend =~ /^(.+):(.+)$/) { if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") { if ($1 ne "PACKAGE_$pkgname") {
if ($parent_condition) { if ($condition) {
$condition = "$parent_condition && $1"; $condition = "$condition && $1";
} else { } else {
$condition = $1; $condition = $1;
} }