KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scripts/package-metadata.pl: fix handling of virtual (PROVIDES) depends

Browse source 
Currently the code emitting dependencies for provide candidates is overwriting
the specification calculated by the previous conditional dependency handling
code, rendering dependencies on virtual PROVIDES packages in conjunction with
conditional dependencies unusable.

Instead of overwriting, append the PROVIDES dependency spec in order to fix
using DEPENDS on virtual provider packages in conjunction with conditions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-10-13 02:48:32 +02:00
parent b7f7e9fe42
commit f64360c7ca
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/package-metadata.pl
View file

@ -179,9 +179,9 @@ sub mconf_depends {
my @vdeps = @$vdep; my @vdeps = @$vdep;
$depend = shift @vdeps; $depend = shift @vdeps;
if (@vdeps > 1) { if (@vdeps > 1) {
$condition = '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')'; $condition = ($condition ? "$condition && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
} elsif (@vdeps > 0) { } elsif (@vdeps > 0) {
$condition = '!PACKAGE_'.$vdeps[0]; $condition = ($condition ? "$condition && " : '') . '!PACKAGE_'.$vdeps[0];
} }
} }