From b4392aded7ea24badb9be72088dd7a7710bda4b6 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Fri, 25 Jul 2025 16:11:11 +0700 Subject: [PATCH] always install musl libc (to be able to compile dynamic with zig) --- src/SPC/doctor/item/LinuxToolCheckList.php | 6 +++--- src/globals/test-extensions.php | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/SPC/doctor/item/LinuxToolCheckList.php b/src/SPC/doctor/item/LinuxToolCheckList.php index 51e191bf..5586bb00 100644 --- a/src/SPC/doctor/item/LinuxToolCheckList.php +++ b/src/SPC/doctor/item/LinuxToolCheckList.php @@ -31,7 +31,7 @@ class LinuxToolCheckList 'tar', 'unzip', 'gzip', 'bzip2', 'cmake', 'patch', 'xz', 'libtoolize', 'which', - 'patchelf', + 'patchelf', 'musl' ]; public const TOOLS_RHEL = [ @@ -40,7 +40,7 @@ class LinuxToolCheckList 'tar', 'unzip', 'gzip', 'gcc', 'bzip2', 'cmake', 'patch', 'which', 'xz', 'libtool', 'gettext-devel', - 'perl', 'patchelf', + 'perl', 'patchelf', 'musl-libc' ]; public const TOOLS_ARCH = [ @@ -69,7 +69,7 @@ class LinuxToolCheckList }; $missing = []; foreach ($required as $package) { - if ($this->findCommand(self::PROVIDED_COMMAND[$package] ?? $package) === null) { + if (self::findCommand(self::PROVIDED_COMMAND[$package] ?? $package) === null) { $missing[] = $package; } } diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 1bba2f9a..f66f7cee 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -156,16 +156,6 @@ if ($shared_extensions) { case 'ubuntu-22.04-arm': $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' '; break; - case 'ubuntu-24.04': - case 'ubuntu-24.04-arm': - putenv('SPC_TARGET=native-native-musl -dynamic'); - if (getenv('SPC_TARGET') && str_contains(getenv('SPC_TARGET'), '-musl')) { - exec('sudo apt install musl -y'); - } - if (getenv('SPC_TARGET')) { - $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' '; - } - break; case 'macos-13': case 'macos-14': case 'macos-15':