From c433aed5217eff3900330ad31dab9bba435940da Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Tue, 26 Aug 2025 19:35:10 +0700 Subject: [PATCH] fix macos? --- src/SPC/builder/extension/swoole.php | 6 ++++++ src/SPC/builder/linux/library/liburing.php | 2 +- src/globals/test-extensions.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SPC/builder/extension/swoole.php b/src/SPC/builder/extension/swoole.php index e3f8c105..a4a531cf 100644 --- a/src/SPC/builder/extension/swoole.php +++ b/src/SPC/builder/extension/swoole.php @@ -9,6 +9,7 @@ use SPC\builder\macos\MacOSBuilder; use SPC\store\FileSystem; use SPC\util\CustomExt; use SPC\util\SPCConfigUtil; +use SPC\util\SPCTarget; #[CustomExt('swoole')] class swoole extends Extension @@ -73,6 +74,11 @@ class swoole extends Extension $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']); $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"'; } + + if (SPCTarget::getTargetOS() === 'Darwin') { + $arg .= ' ac_cv_lib_pthread_pthread_barrier_init=no'; + } + return $arg; } } diff --git a/src/SPC/builder/linux/library/liburing.php b/src/SPC/builder/linux/library/liburing.php index 802f366f..9ed416a9 100644 --- a/src/SPC/builder/linux/library/liburing.php +++ b/src/SPC/builder/linux/library/liburing.php @@ -51,7 +51,7 @@ class liburing extends LinuxLibraryBase $use_libc ? '--use-libc' : '', ) ->configure() - ->make('install library', with_clean: false) + ->make('library', with_clean: false) ->exec("rm -rf {$this->getLibDir()}/liburing*.so*"); $this->patchPkgconfPrefix(['liburing.pc', 'liburing-ffi.pc']); diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 15ec3c98..9a159fbc 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -25,7 +25,7 @@ $test_php_version = [ $test_os = [ // 'macos-13', // bin/spc for x86_64 // 'macos-14', // bin/spc for arm64 - // 'macos-15', // bin/spc for arm64 + 'macos-15', // bin/spc for arm64 'ubuntu-latest', // bin/spc-alpine-docker for x86_64 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 'ubuntu-24.04', // bin/spc for x86_64