Compare commits

...

4 Commits

Author SHA1 Message Date
Kévin Dunglas
f4327c8c81 fix 2023-08-22 01:50:13 +08:00
Kévin Dunglas
4a4b0e209c detect PHP 8.1+ 2023-08-22 01:50:13 +08:00
Kévin Dunglas
60e06737d7 fix: disable Zend Signals and enable Zend Max Execution Timers for ZTS builds 2023-08-22 01:50:13 +08:00
Kévin Dunglas
d326154241 fix: musl detection on non-x86_64 2023-08-22 00:56:59 +08:00
3 changed files with 13 additions and 4 deletions

View File

@ -168,8 +168,16 @@ class LinuxBuilder extends BuilderBase
SourcePatcher::patchBeforeConfigure($this);
$json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts ' : '';
$phpVersionID = $this->getPHPVersionID();
$json_74 = $phpVersionID < 80000 ? '--enable-json ' : '';
if ($this->getOption('enable-zts', false)) {
$maxExecutionTimers = $phpVersionID >= 80100 ? '--enable-zend-max-execution-timers ' : '';
$zts = '--enable-zts --disable-zend-signals ';
} else {
$maxExecutionTimers = '';
$zts = '';
}
shell()->cd(SOURCE_PATH . '/php-src')
->exec(
@ -185,6 +193,7 @@ class LinuxBuilder extends BuilderBase
'--enable-fpm ' .
$json_74 .
$zts .
$maxExecutionTimers .
'--enable-micro=all-static ' .
$this->makeExtensionArgs() . ' ' .
$envs

View File

@ -149,7 +149,7 @@ class MacOSBuilder extends BuilderBase
SourcePatcher::patchBeforeConfigure($this);
$json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';
shell()->cd(SOURCE_PATH . '/php-src')
->exec(

View File

@ -16,7 +16,7 @@ class LinuxMuslCheck
#[AsCheckItem('if musl-libc is installed', limit_os: 'Linux')]
public function checkMusl(): ?CheckResult
{
$file = '/lib/ld-musl-x86_64.so.1';
$file = sprintf('/lib/ld-musl-%s.so.1', php_uname('m'));
if (file_exists($file)) {
return CheckResult::ok();
}