From 86541b1aa870a3a4c24feb2d11823486f8bddcc7 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Thu, 5 Jun 2025 19:58:38 +0700 Subject: [PATCH] only apply ffi patch at version >= 8.3.16 --- src/SPC/store/SourcePatcher.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SPC/store/SourcePatcher.php b/src/SPC/store/SourcePatcher.php index e16e84a4..656e34cd 100644 --- a/src/SPC/store/SourcePatcher.php +++ b/src/SPC/store/SourcePatcher.php @@ -454,6 +454,9 @@ class SourcePatcher public static function patchFfiCentos7FixO3strncmp(): bool { + if (PHP_OS_FAMILY !== 'Linux' || SystemUtil::getLibcVersionIfExists() >= '2.17') { + return false; + } $version = null; if (file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) { $file = SOURCE_PATH . '/php-src/main/php_version.h'; @@ -464,11 +467,8 @@ class SourcePatcher if (version_compare($version, '8.3.16', '<')) { return false; } - if (PHP_OS_FAMILY === 'Linux' && SystemUtil::getLibcVersionIfExists() === '2.17') { - SourcePatcher::patchFile('ffi_centos7_fix_O3_strncmp.patch', SOURCE_PATH . '/php-src'); - return true; - } - return false; + SourcePatcher::patchFile('ffi_centos7_fix_O3_strncmp.patch', SOURCE_PATH . '/php-src'); + return true; } public static function patchLibaomForAlpine(): bool