mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 00:30:16 +02:00
metadata: fix handling of multiple build dependencies with different conditions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25505 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
05d8c72a84
commit
e10871bad0
@ -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;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user