fix macos?

This commit is contained in:
DubbleClick 2025-08-26 19:35:10 +07:00
parent 1243fb9678
commit c433aed521
3 changed files with 8 additions and 2 deletions

View File

@ -9,6 +9,7 @@ use SPC\builder\macos\MacOSBuilder;
use SPC\store\FileSystem; use SPC\store\FileSystem;
use SPC\util\CustomExt; use SPC\util\CustomExt;
use SPC\util\SPCConfigUtil; use SPC\util\SPCConfigUtil;
use SPC\util\SPCTarget;
#[CustomExt('swoole')] #[CustomExt('swoole')]
class swoole extends Extension class swoole extends Extension
@ -73,6 +74,11 @@ class swoole extends Extension
$config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']); $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
$arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"'; $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; return $arg;
} }
} }

View File

@ -51,7 +51,7 @@ class liburing extends LinuxLibraryBase
$use_libc ? '--use-libc' : '', $use_libc ? '--use-libc' : '',
) )
->configure() ->configure()
->make('install library', with_clean: false) ->make('library', with_clean: false)
->exec("rm -rf {$this->getLibDir()}/liburing*.so*"); ->exec("rm -rf {$this->getLibDir()}/liburing*.so*");
$this->patchPkgconfPrefix(['liburing.pc', 'liburing-ffi.pc']); $this->patchPkgconfPrefix(['liburing.pc', 'liburing-ffi.pc']);

View File

@ -25,7 +25,7 @@ $test_php_version = [
$test_os = [ $test_os = [
// 'macos-13', // bin/spc for x86_64 // 'macos-13', // bin/spc for x86_64
// 'macos-14', // bin/spc for arm64 // '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-latest', // bin/spc-alpine-docker for x86_64
'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
'ubuntu-24.04', // bin/spc for x86_64 'ubuntu-24.04', // bin/spc for x86_64