From 6177b649ca8cd11545fe945245b449236ac4bd50 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 23 Sep 2016 23:17:09 +0200 Subject: [PATCH] scripts/package-metadata.pl: fix generation of dependencies on virtual packages Dependencies on purely virtual packages (satisfied by PROVIDES) that were not using "selects" ("+" flag) would be prepended with the prefix "PACKAGE_" twice, breaking the first alternative. Signed-off-by: Matthias Schiffer --- scripts/package-metadata.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl index 44494efd28..09aed96c2b 100755 --- a/scripts/package-metadata.pl +++ b/scripts/package-metadata.pl @@ -193,12 +193,15 @@ sub mconf_depends { $m = "select"; next if $only_dep; + + $flags =~ /@/ or $depend = "PACKAGE_$depend"; } else { if ($vdep = $package{$depend}->{vdepends}) { $depend = join("||", map { "PACKAGE_".$_ } @$vdep); + } else { + $flags =~ /@/ or $depend = "PACKAGE_$depend"; } } - $flags =~ /@/ or $depend = "PACKAGE_$depend"; if ($condition) { if ($m =~ /select/) { next if $depend eq $condition;