mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:34:36 +02:00
scripts/metadata.pl: fix handling of multiple conditional depends on the same package
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20085 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
3439dece43
commit
330b8a44a5
@ -423,6 +423,8 @@ sub mconf_depends {
|
||||
my $vdep;
|
||||
my $condition = $parent_condition;
|
||||
|
||||
next if $seen->{$depend};
|
||||
$seen->{$depend} = 1;
|
||||
if ($depend =~ /^(.+):(.+)$/) {
|
||||
if ($1 ne "PACKAGE_$pkgname") {
|
||||
if ($condition) {
|
||||
@ -433,9 +435,7 @@ sub mconf_depends {
|
||||
}
|
||||
$depend = $2;
|
||||
}
|
||||
next if $seen->{$depend};
|
||||
next if $package{$depend} and $package{$depend}->{buildonly};
|
||||
$seen->{$depend} = 1;
|
||||
if ($vdep = $package{$depend}->{vdepends}) {
|
||||
$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user