1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-17 15:14:44 +02:00

fix duplicate dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9311 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-10-14 05:25:50 +00:00
parent 323d4460bf
commit 0833470180

View File

@ -301,6 +301,8 @@ sub mconf_depends($$) {
my $depends = shift; my $depends = shift;
my $only_dep = shift; my $only_dep = shift;
my $res; my $res;
my $dep = shift;
$dep or $dep = {};
$depends or return; $depends or return;
my @depends = @$depends; my @depends = @$depends;
@ -321,10 +323,14 @@ sub mconf_depends($$) {
# thus if FOO depends on other config options, these dependencies # thus if FOO depends on other config options, these dependencies
# will not be checked. To fix this, we simply emit all of FOO's # will not be checked. To fix this, we simply emit all of FOO's
# depends here as well. # depends here as well.
$package{$depend} and $res .= mconf_depends($package{$depend}->{depends}, 1); $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep);
}; };
$flags =~ /@/ or $depend = "PACKAGE_$depend"; $flags =~ /@/ or $depend = "PACKAGE_$depend";
} }
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
foreach my $depend (keys %$dep) {
my $m = $dep->{$depend};
$res .= "\t\t$m $depend\n"; $res .= "\t\t$m $depend\n";
} }
return $res; return $res;