suggestions

This commit is contained in:
henderkes
2025-10-31 09:08:15 +01:00
parent b88a68dab8
commit ff15973a25
3 changed files with 3 additions and 21 deletions

View File

@@ -105,7 +105,7 @@ class DependencyUtil
* @param array $additional_libs Array of additional libraries
* @return array Ordered array of extension names
*/
public static function getExtsAndLibs(array $exts, array $additional_libs = [], bool $include_suggested_exts = false, bool $include_suggested_libs = false, array $extra_libraries_from_builder = []): array
public static function getExtsAndLibs(array $exts, array $additional_libs = [], bool $include_suggested_exts = false, bool $include_suggested_libs = false): array
{
$dep_list = self::platExtToLibs();
@@ -144,23 +144,6 @@ class DependencyUtil
$dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
}
}
// include suggested libraries
if ($extra_libraries_from_builder) {
// check every deps suggests
foreach ($dep_list as $name => $obj) {
$del_list = [];
foreach ($obj['suggests'] as $id => $suggest) {
if (!str_starts_with($suggest, 'ext@') && in_array($suggest, $extra_libraries_from_builder)) {
$dep_list[$name]['depends'][] = $suggest;
$del_list[] = $id;
}
}
foreach ($del_list as $id) {
unset($dep_list[$name]['suggests'][$id]);
}
$dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
}
}
// convert ext_name to ext@ext_name
$origin_exts = $exts;