qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:30:16 +02:00
Code

scripts/metadata.pl: fix handling of multiple conditional depends on the same package

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20085 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-03-09 15:51:40 +00:00
parent 3439dece43
commit 330b8a44a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/metadata.pl
View File

@ -423,6 +423,8 @@ sub mconf_depends {
my $vdep; my $vdep;
my $condition = $parent_condition; my $condition = $parent_condition;
next if $seen->{$depend};
$seen->{$depend} = 1;
if ($depend =~ /^(.+):(.+)$/) { if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") { if ($1 ne "PACKAGE_$pkgname") {
if ($condition) { if ($condition) {
@ -433,9 +435,7 @@ sub mconf_depends {
} }
$depend = $2; $depend = $2;
} }
next if $seen->{$depend};
next if $package{$depend} and $package{$depend}->{buildonly}; next if $package{$depend} and $package{$depend}->{buildonly};
$seen->{$depend} = 1;
if ($vdep = $package{$depend}->{vdepends}) { if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep); $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else { } else {