crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

check for libacl in fewer places

Browse Source
This commit is contained in:
Marc Henderkes 2025-03-12 09:19:01 +01:00
parent 76ac57edf4
commit 5caf5b7694
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/lib.json
View File

@ -11,6 +11,11 @@
"lib-depends": [ "lib-depends": [
"lib-base", "lib-base",
"micro" "micro"
],
"lib-depends-linux": [
"lib-base",
"libacl",
"micro"
] ]
}, },
"micro": { "micro": {

5
src/SPC/command/BuildCliCommand.php
View File

@ -5,7 +5,6 @@ declare(strict_types=1);
namespace SPC\command; namespace SPC\command;
use SPC\builder\BuilderProvider; use SPC\builder\BuilderProvider;
use SPC\builder\linux\LinuxBuilder;
use SPC\exception\ExceptionHandler; use SPC\exception\ExceptionHandler;
use SPC\exception\WrongUsageException; use SPC\exception\WrongUsageException;
use SPC\store\Config; use SPC\store\Config;
@ -109,8 +108,8 @@ class BuildCliCommand extends BuildCommand
$include_suggest_ext = $this->getOption('with-suggested-exts'); $include_suggest_ext = $this->getOption('with-suggested-exts');
$include_suggest_lib = $this->getOption('with-suggested-libs'); $include_suggest_lib = $this->getOption('with-suggested-libs');
[$extensions, $libraries, $not_included] = DependencyUtil::getExtsAndLibs($extensions, $libraries, $include_suggest_ext, $include_suggest_lib); [$extensions, $libraries, $not_included] = DependencyUtil::getExtsAndLibs($extensions, $libraries, $include_suggest_ext, $include_suggest_lib);
if ($builder instanceof LinuxBuilder && !in_array('libacl', $libraries) && ($rule & BUILD_TARGET_FPM)) { if (PHP_OS_FAMILY !== 'Linux' || !($rule & BUILD_TARGET_FPM)) {
array_unshift($libraries, 'attr', 'libacl'); $libraries = array_filter($libraries, fn ($lib) => !in_array($lib, ['attr', 'libacl']));
} }
$display_libs = array_filter($libraries, fn ($lib) => in_array(Config::getLib($lib, 'type', 'lib'), ['lib', 'package'])); $display_libs = array_filter($libraries, fn ($lib) => in_array(Config::getLib($lib, 'type', 'lib'), ['lib', 'package']));

3
src/SPC/command/DownloadCommand.php
View File

@ -81,9 +81,6 @@ class DownloadCommand extends BaseCommand
$final_sources = array_merge($final_sources, array_diff($sources, $final_sources)); $final_sources = array_merge($final_sources, array_diff($sources, $final_sources));
} }
if (!empty($final_sources)) { if (!empty($final_sources)) {
if (PHP_OS_FAMILY === 'Linux') {
array_unshift($final_sources, 'attr', 'libacl');
}
$input->setArgument('sources', implode(',', $final_sources)); $input->setArgument('sources', implode(',', $final_sources));
} }
parent::initialize($input, $output); parent::initialize($input, $output);