From 3f92df0865e13504ef82209e197e4bcc4ef2fc1e Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Fri, 20 Jun 2025 15:57:16 +0700 Subject: [PATCH] patch before make for uv fix --- src/SPC/builder/Extension.php | 4 ++-- src/SPC/builder/extension/uv.php | 4 ++-- src/SPC/doctor/item/LinuxToolCheckList.php | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php index d6dde237..f6e3508d 100644 --- a/src/SPC/builder/Extension.php +++ b/src/SPC/builder/Extension.php @@ -400,7 +400,7 @@ class Extension ->exec(BUILD_BIN_PATH . '/phpize'); if ($this->patchBeforeSharedConfigure()) { - logger()->info('ext [ . ' . $this->getName() . '] patching before shared configure'); + logger()->info('ext [' . $this->getName() . '] patching before shared configure'); } shell()->cd($this->source_dir) @@ -419,7 +419,7 @@ class Extension ); if ($this->patchBeforeSharedMake()) { - logger()->info('ext [ . ' . $this->getName() . '] patching before shared make'); + logger()->info('ext [' . $this->getName() . '] patching before shared make'); } shell()->cd($this->source_dir) diff --git a/src/SPC/builder/extension/uv.php b/src/SPC/builder/extension/uv.php index d8755a89..ffe92bcc 100644 --- a/src/SPC/builder/extension/uv.php +++ b/src/SPC/builder/extension/uv.php @@ -21,10 +21,10 @@ class uv extends Extension public function patchBeforeSharedMake(): bool { - if (PHP_OS_FAMILY !== 'Linux' || php_uname('m') !== 'aarch64' || SystemUtil::getLibcVersionIfExists() > '2.17') { + if (PHP_OS_FAMILY !== 'Linux' || GNU_ARCH !== 'aarch64') { return false; } - FileSystem::replaceFileRegex($this->source_dir . '/Makefile', '/^(LDFLAGS =.*)$/', '$1 -luv -ldl -lrt -pthread'); + FileSystem::replaceFileRegex($this->source_dir . '/Makefile', '/^(LDFLAGS =.*)$/m', '$1 -luv -ldl -lrt -pthread'); return true; } } diff --git a/src/SPC/doctor/item/LinuxToolCheckList.php b/src/SPC/doctor/item/LinuxToolCheckList.php index 56235b0c..cd18c26f 100644 --- a/src/SPC/doctor/item/LinuxToolCheckList.php +++ b/src/SPC/doctor/item/LinuxToolCheckList.php @@ -61,8 +61,7 @@ class LinuxToolCheckList $required = match ($distro['dist']) { 'alpine' => self::TOOLS_ALPINE, - 'redhat' => self::TOOLS_RHEL, - 'centos' => array_merge(self::TOOLS_RHEL, ['perl-IPC-Cmd']), + 'redhat', 'centos' => self::TOOLS_RHEL, 'arch' => self::TOOLS_ARCH, default => self::TOOLS_DEBIAN, };