qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:22:27 +02:00
Code

metadata: fix handling of multiple build dependencies with different conditions

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25505 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-02-13 02:52:22 +00:00
parent 05d8c72a84
commit e10871bad0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/metadata.pl
View File

@ -738,7 +738,7 @@ sub gen_package_mk() {
if ($idx) { if ($idx) {
my $depline; my $depline;
next if $pkg->{src} eq $pkg_dep->{src}.$suffix; next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
next if $dep{$pkg->{src}."->".$idx}; next if $dep{$condition.":".$pkg->{src}."->".$idx};
next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends}; next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
my $depstr; my $depstr;