mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-02 14:25:41 +08:00
Compare commits
65 Commits
fable-v3-w
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f2b2af774c | ||
|
|
a78e6fa5f8 | ||
|
|
5d9e4e2c81 | ||
|
|
eb97711347 | ||
|
|
5c8ec7a56d | ||
|
|
e85cd55dba | ||
|
|
f9f4ca9a01 | ||
|
|
fd882ce03e | ||
|
|
99a512c4a4 | ||
|
|
8d038f435d | ||
|
|
134186c94f | ||
|
|
ef95e4f857 | ||
|
|
fd4f70d526 | ||
|
|
c7738749e2 | ||
|
|
44f9cb1ffd | ||
|
|
970343b143 | ||
|
|
e21bb528c0 | ||
|
|
5b5861c366 | ||
|
|
7a71a40824 | ||
|
|
a9e1327a80 | ||
|
|
93a227bc6d | ||
|
|
4eaeeb8230 | ||
|
|
0588401ee3 | ||
|
|
75856e361e | ||
|
|
abfdae256a | ||
|
|
450e0e1ecb | ||
|
|
a373df2444 | ||
|
|
95a4b4d738 | ||
|
|
4e9edf6c9d | ||
|
|
14fc3f8d87 | ||
|
|
f52e8ad449 | ||
|
|
4318ef8fa3 | ||
|
|
8630fd57e2 | ||
|
|
0a3c56ba49 | ||
|
|
b1a77b01e2 | ||
|
|
f39d77dde0 | ||
|
|
cc7a22922c | ||
|
|
1a395a2b0f | ||
|
|
bfe4a012b8 | ||
|
|
ab17fbe288 | ||
|
|
7a65135c68 | ||
|
|
f57986ccbf | ||
|
|
9bcb809117 | ||
|
|
2073652744 | ||
|
|
1440f104bb | ||
|
|
834cc4d16e | ||
|
|
a9c16b74d7 | ||
|
|
c532b9e893 | ||
|
|
73dd885342 | ||
|
|
be24fd9467 | ||
|
|
bf1f54a091 | ||
|
|
1c3dc91845 | ||
|
|
565ff27b71 | ||
|
|
f48961c72d | ||
|
|
a0c2fefd24 | ||
|
|
f585cc446a | ||
|
|
f43e915341 | ||
|
|
93f68b209f | ||
|
|
3fb68f3989 | ||
|
|
4f27d2d9d1 | ||
|
|
562fbf2a9c | ||
|
|
cbf1ed7662 | ||
|
|
4bba584e88 | ||
|
|
0ed1bbc74a | ||
|
|
1272acd07e |
@@ -74,6 +74,19 @@
|
|||||||
"qdbm"
|
"qdbm"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"decimal": {
|
||||||
|
"type": "external",
|
||||||
|
"source": "ext-decimal",
|
||||||
|
"arg-type": "custom",
|
||||||
|
"lib-depends": [
|
||||||
|
"libmpdec"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"deepclone": {
|
||||||
|
"type": "external",
|
||||||
|
"source": "deepclone",
|
||||||
|
"arg-type": "enable"
|
||||||
|
},
|
||||||
"dio": {
|
"dio": {
|
||||||
"support": {
|
"support": {
|
||||||
"BSD": "wip"
|
"BSD": "wip"
|
||||||
|
|||||||
@@ -528,6 +528,18 @@
|
|||||||
"maxminddb_config.h"
|
"maxminddb_config.h"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"libmpdec": {
|
||||||
|
"source": "libmpdec",
|
||||||
|
"static-libs-unix": [
|
||||||
|
"libmpdec.a"
|
||||||
|
],
|
||||||
|
"static-libs-windows": [
|
||||||
|
"libmpdec_a.lib"
|
||||||
|
],
|
||||||
|
"headers": [
|
||||||
|
"mpdecimal.h"
|
||||||
|
]
|
||||||
|
},
|
||||||
"libmemcached": {
|
"libmemcached": {
|
||||||
"source": "libmemcached",
|
"source": "libmemcached",
|
||||||
"cpp-library": true,
|
"cpp-library": true,
|
||||||
|
|||||||
@@ -84,6 +84,25 @@
|
|||||||
"path": "COPYING"
|
"path": "COPYING"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"ext-decimal": {
|
||||||
|
"type": "ghtagtar",
|
||||||
|
"repo": "php-decimal/ext-decimal",
|
||||||
|
"match": "v2\\.\\d.*",
|
||||||
|
"path": "php-src/ext/decimal",
|
||||||
|
"license": {
|
||||||
|
"type": "file",
|
||||||
|
"path": "LICENSE"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"deepclone": {
|
||||||
|
"type": "ghtagtar",
|
||||||
|
"repo": "symfony/php-ext-deepclone",
|
||||||
|
"path": "php-src/ext/deepclone",
|
||||||
|
"license": {
|
||||||
|
"type": "file",
|
||||||
|
"path": "LICENSE"
|
||||||
|
}
|
||||||
|
},
|
||||||
"dio": {
|
"dio": {
|
||||||
"type": "url",
|
"type": "url",
|
||||||
"url": "https://pecl.php.net/get/dio",
|
"url": "https://pecl.php.net/get/dio",
|
||||||
@@ -227,7 +246,7 @@
|
|||||||
},
|
},
|
||||||
"ext-rdkafka": {
|
"ext-rdkafka": {
|
||||||
"type": "ghtar",
|
"type": "ghtar",
|
||||||
"repo": "arnaud-lb/php-rdkafka",
|
"repo": "php-rdkafka/php-rdkafka",
|
||||||
"path": "php-src/ext/rdkafka",
|
"path": "php-src/ext/rdkafka",
|
||||||
"license": {
|
"license": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
@@ -314,10 +333,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ext-zstd": {
|
"ext-zstd": {
|
||||||
"type": "git",
|
"type": "ghtagtar",
|
||||||
|
"repo": "kjdev/php-ext-zstd",
|
||||||
"path": "php-src/ext/zstd",
|
"path": "php-src/ext/zstd",
|
||||||
"rev": "master",
|
|
||||||
"url": "https://github.com/kjdev/php-ext-zstd",
|
|
||||||
"license": {
|
"license": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "LICENSE"
|
"path": "LICENSE"
|
||||||
@@ -681,6 +699,14 @@
|
|||||||
"path": "LICENSE"
|
"path": "LICENSE"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"libmpdec": {
|
||||||
|
"type": "url",
|
||||||
|
"url": "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.1.tar.gz",
|
||||||
|
"license": {
|
||||||
|
"type": "file",
|
||||||
|
"path": "COPYRIGHT.txt"
|
||||||
|
}
|
||||||
|
},
|
||||||
"libmemcached": {
|
"libmemcached": {
|
||||||
"type": "ghtagtar",
|
"type": "ghtagtar",
|
||||||
"repo": "awesomized/libmemcached",
|
"repo": "awesomized/libmemcached",
|
||||||
@@ -973,7 +999,7 @@
|
|||||||
"openssl": {
|
"openssl": {
|
||||||
"type": "ghrel",
|
"type": "ghrel",
|
||||||
"repo": "openssl/openssl",
|
"repo": "openssl/openssl",
|
||||||
"match": "openssl.+\\.tar\\.gz",
|
"match": "openssl-3.+\\.tar\\.gz",
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"alt": {
|
"alt": {
|
||||||
"type": "filelist",
|
"type": "filelist",
|
||||||
@@ -1167,7 +1193,6 @@
|
|||||||
"path": "php-src/ext/swoole",
|
"path": "php-src/ext/swoole",
|
||||||
"type": "ghtar",
|
"type": "ghtar",
|
||||||
"repo": "swoole/swoole-src",
|
"repo": "swoole/swoole-src",
|
||||||
"match": "v6\\.+",
|
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"license": {
|
"license": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ parameters:
|
|||||||
- PHP_OS_FAMILY
|
- PHP_OS_FAMILY
|
||||||
excludePaths:
|
excludePaths:
|
||||||
analyseAndScan:
|
analyseAndScan:
|
||||||
|
- ./src/globals/ext-tests/decimal.php
|
||||||
- ./src/globals/ext-tests/swoole.php
|
- ./src/globals/ext-tests/swoole.php
|
||||||
- ./src/globals/ext-tests/swoole.phpt
|
- ./src/globals/ext-tests/swoole.phpt
|
||||||
- ./src/globals/test-extensions.php
|
- ./src/globals/test-extensions.php
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
|
|||||||
*/
|
*/
|
||||||
final class ConsoleApplication extends Application
|
final class ConsoleApplication extends Application
|
||||||
{
|
{
|
||||||
public const string VERSION = '2.8.5';
|
public const string VERSION = '2.8.6';
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ use SPC\exception\ValidationException;
|
|||||||
use SPC\exception\WrongUsageException;
|
use SPC\exception\WrongUsageException;
|
||||||
use SPC\store\Config;
|
use SPC\store\Config;
|
||||||
use SPC\store\FileSystem;
|
use SPC\store\FileSystem;
|
||||||
|
use SPC\toolchain\ToolchainManager;
|
||||||
|
use SPC\toolchain\ZigToolchain;
|
||||||
|
use SPC\util\GlobalEnvManager;
|
||||||
use SPC\util\SPCConfigUtil;
|
use SPC\util\SPCConfigUtil;
|
||||||
use SPC\util\SPCTarget;
|
use SPC\util\SPCTarget;
|
||||||
|
|
||||||
@@ -231,7 +234,7 @@ class Extension
|
|||||||
if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
|
if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
|
||||||
$prefix = $matches[1];
|
$prefix = $matches[1];
|
||||||
$currentLibs = trim($matches[2]);
|
$currentLibs = trim($matches[2]);
|
||||||
$newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
|
$newLibs = clean_spaces("{$currentLibs} {$staticLibs} {$lstdcpp}");
|
||||||
$deduplicatedLibs = deduplicate_flags($newLibs);
|
$deduplicatedLibs = deduplicate_flags($newLibs);
|
||||||
|
|
||||||
FileSystem::replaceFileRegex(
|
FileSystem::replaceFileRegex(
|
||||||
@@ -543,6 +546,11 @@ class Extension
|
|||||||
*/
|
*/
|
||||||
protected function getSharedExtensionEnv(): array
|
protected function getSharedExtensionEnv(): array
|
||||||
{
|
{
|
||||||
|
$compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
|
||||||
|
if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
||||||
|
$compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
|
||||||
|
GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
|
||||||
|
}
|
||||||
$config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
|
$config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
|
||||||
[$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
|
[$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
|
||||||
$preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
|
$preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
|
||||||
|
|||||||
46
src/SPC/builder/extension/decimal.php
Normal file
46
src/SPC/builder/extension/decimal.php
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace SPC\builder\extension;
|
||||||
|
|
||||||
|
use SPC\builder\Extension;
|
||||||
|
use SPC\store\FileSystem;
|
||||||
|
use SPC\util\CustomExt;
|
||||||
|
|
||||||
|
#[CustomExt('decimal')]
|
||||||
|
class decimal extends Extension
|
||||||
|
{
|
||||||
|
// TODO: remove this when https://github.com/php-decimal/ext-decimal/issues/92 is merged
|
||||||
|
public function patchBeforeBuildconf(): bool
|
||||||
|
{
|
||||||
|
FileSystem::replaceFileStr(
|
||||||
|
$this->source_dir . '/php_decimal.c',
|
||||||
|
[
|
||||||
|
'zend_module_entry decimal_module_entry',
|
||||||
|
'ZEND_GET_MODULE(decimal)',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'zend_module_entry php_decimal_module_entry',
|
||||||
|
'ZEND_GET_MODULE(php_decimal)',
|
||||||
|
]
|
||||||
|
);
|
||||||
|
FileSystem::replaceFileStr(
|
||||||
|
$this->source_dir . '/config.w32',
|
||||||
|
'ARG_WITH("decimal", "for decimal support", "no");',
|
||||||
|
'ARG_WITH("decimal", "for decimal support", "no");' . "\n" .
|
||||||
|
'ADD_EXTENSION_DEP("decimal", "json");'
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getUnixConfigureArg(bool $shared = false): string
|
||||||
|
{
|
||||||
|
return '--enable-decimal --with-libmpdec-path="' . BUILD_ROOT_PATH . '"';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getWindowsConfigureArg(bool $shared = false): string
|
||||||
|
{
|
||||||
|
return '--with-decimal';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,11 +5,22 @@ declare(strict_types=1);
|
|||||||
namespace SPC\builder\extension;
|
namespace SPC\builder\extension;
|
||||||
|
|
||||||
use SPC\builder\Extension;
|
use SPC\builder\Extension;
|
||||||
|
use SPC\store\FileSystem;
|
||||||
use SPC\util\CustomExt;
|
use SPC\util\CustomExt;
|
||||||
|
|
||||||
#[CustomExt('mongodb')]
|
#[CustomExt('mongodb')]
|
||||||
class mongodb extends Extension
|
class mongodb extends Extension
|
||||||
{
|
{
|
||||||
|
public function patchBeforeBuildconf(): bool
|
||||||
|
{
|
||||||
|
FileSystem::replaceFileRegex(
|
||||||
|
SOURCE_PATH . '/php-src/ext/mongodb/config.m4',
|
||||||
|
'/^(\s+)(src\/libmongoc\/)/m',
|
||||||
|
'$1${ac_config_dir}/$2'
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public function getUnixConfigureArg(bool $shared = false): string
|
public function getUnixConfigureArg(bool $shared = false): string
|
||||||
{
|
{
|
||||||
$arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';
|
$arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ class password_argon2 extends Extension
|
|||||||
|
|
||||||
public function getConfigureArg(bool $shared = false): string
|
public function getConfigureArg(bool $shared = false): string
|
||||||
{
|
{
|
||||||
if ($this->builder->getLib('openssl') !== null) {
|
if ($this->builder->getExt('openssl')?->isBuildStatic() || $this->isBuildShared()) {
|
||||||
if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
|
if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
|
||||||
return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
|
return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ namespace SPC\builder\extension;
|
|||||||
use SPC\builder\Extension;
|
use SPC\builder\Extension;
|
||||||
use SPC\store\SourcePatcher;
|
use SPC\store\SourcePatcher;
|
||||||
use SPC\util\CustomExt;
|
use SPC\util\CustomExt;
|
||||||
use SPC\util\GlobalEnvManager;
|
|
||||||
|
|
||||||
#[CustomExt('xlswriter')]
|
#[CustomExt('xlswriter')]
|
||||||
class xlswriter extends Extension
|
class xlswriter extends Extension
|
||||||
@@ -29,13 +28,6 @@ class xlswriter extends Extension
|
|||||||
public function patchBeforeMake(): bool
|
public function patchBeforeMake(): bool
|
||||||
{
|
{
|
||||||
$patched = parent::patchBeforeMake();
|
$patched = parent::patchBeforeMake();
|
||||||
|
|
||||||
// Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
|
|
||||||
if (PHP_OS_FAMILY !== 'Windows') {
|
|
||||||
GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
|
|
||||||
$patched = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (PHP_OS_FAMILY === 'Windows') {
|
if (PHP_OS_FAMILY === 'Windows') {
|
||||||
// fix windows build with openssl extension duplicate symbol bug
|
// fix windows build with openssl extension duplicate symbol bug
|
||||||
SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->source_dir);
|
SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->source_dir);
|
||||||
@@ -48,10 +40,4 @@ class xlswriter extends Extension
|
|||||||
}
|
}
|
||||||
return $patched;
|
return $patched;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
|
|
||||||
protected function getExtraEnv(): array
|
|
||||||
{
|
|
||||||
return ['CFLAGS' => '-std=gnu17'];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
12
src/SPC/builder/freebsd/library/libmpdec.php
Normal file
12
src/SPC/builder/freebsd/library/libmpdec.php
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace SPC\builder\freebsd\library;
|
||||||
|
|
||||||
|
class libmpdec extends BSDLibraryBase
|
||||||
|
{
|
||||||
|
use \SPC\builder\unix\library\libmpdec;
|
||||||
|
|
||||||
|
public const NAME = 'libmpdec';
|
||||||
|
}
|
||||||
@@ -11,6 +11,8 @@ use SPC\store\Config;
|
|||||||
use SPC\store\DirDiff;
|
use SPC\store\DirDiff;
|
||||||
use SPC\store\FileSystem;
|
use SPC\store\FileSystem;
|
||||||
use SPC\store\SourcePatcher;
|
use SPC\store\SourcePatcher;
|
||||||
|
use SPC\toolchain\ToolchainManager;
|
||||||
|
use SPC\toolchain\ZigToolchain;
|
||||||
use SPC\util\GlobalEnvManager;
|
use SPC\util\GlobalEnvManager;
|
||||||
use SPC\util\SPCConfigUtil;
|
use SPC\util\SPCConfigUtil;
|
||||||
use SPC\util\SPCTarget;
|
use SPC\util\SPCTarget;
|
||||||
@@ -65,7 +67,8 @@ class LinuxBuilder extends UnixBuilderBase
|
|||||||
// php 8.5 contains opcache extension by default,
|
// php 8.5 contains opcache extension by default,
|
||||||
// if opcache_jit is enabled for 8.5 or opcache enabled,
|
// if opcache_jit is enabled for 8.5 or opcache enabled,
|
||||||
// we need to disable undefined behavior sanitizer.
|
// we need to disable undefined behavior sanitizer.
|
||||||
f_putenv('SPC_COMPILER_EXTRA=-fno-sanitize=undefined');
|
$compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
|
||||||
|
f_putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->getOption('enable-zts', false)) {
|
if ($this->getOption('enable-zts', false)) {
|
||||||
@@ -266,6 +269,11 @@ class LinuxBuilder extends UnixBuilderBase
|
|||||||
*/
|
*/
|
||||||
protected function buildEmbed(): void
|
protected function buildEmbed(): void
|
||||||
{
|
{
|
||||||
|
$compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
|
||||||
|
if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
||||||
|
$compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
|
||||||
|
GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
|
||||||
|
}
|
||||||
$sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
|
$sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
|
||||||
$sharedExts = array_filter($sharedExts, static function ($ext) {
|
$sharedExts = array_filter($sharedExts, static function ($ext) {
|
||||||
return Config::getExt($ext->getName(), 'build-with-php') === true;
|
return Config::getExt($ext->getName(), 'build-with-php') === true;
|
||||||
|
|||||||
12
src/SPC/builder/linux/library/libmpdec.php
Normal file
12
src/SPC/builder/linux/library/libmpdec.php
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace SPC\builder\linux\library;
|
||||||
|
|
||||||
|
class libmpdec extends LinuxLibraryBase
|
||||||
|
{
|
||||||
|
use \SPC\builder\unix\library\libmpdec;
|
||||||
|
|
||||||
|
public const NAME = 'libmpdec';
|
||||||
|
}
|
||||||
12
src/SPC/builder/macos/library/libmpdec.php
Normal file
12
src/SPC/builder/macos/library/libmpdec.php
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace SPC\builder\macos\library;
|
||||||
|
|
||||||
|
class libmpdec extends MacOSLibraryBase
|
||||||
|
{
|
||||||
|
use \SPC\builder\unix\library\libmpdec;
|
||||||
|
|
||||||
|
public const NAME = 'libmpdec';
|
||||||
|
}
|
||||||
@@ -50,7 +50,7 @@ trait UnixSystemUtilTrait
|
|||||||
$defined = array_unique($defined);
|
$defined = array_unique($defined);
|
||||||
sort($defined);
|
sort($defined);
|
||||||
// export
|
// export
|
||||||
if (SPCTarget::getTargetOS() === 'Linux') {
|
if (SPCTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() !== ZigToolchain::class) {
|
||||||
file_put_contents("{$lib_file}.dynsym", "{\n" . implode("\n", array_map(fn ($x) => " {$x};", $defined)) . "};\n");
|
file_put_contents("{$lib_file}.dynsym", "{\n" . implode("\n", array_map(fn ($x) => " {$x};", $defined)) . "};\n");
|
||||||
} else {
|
} else {
|
||||||
file_put_contents("{$lib_file}.dynsym", implode("\n", $defined) . "\n");
|
file_put_contents("{$lib_file}.dynsym", implode("\n", $defined) . "\n");
|
||||||
@@ -72,10 +72,6 @@ trait UnixSystemUtilTrait
|
|||||||
if (!is_file($symbol_file)) {
|
if (!is_file($symbol_file)) {
|
||||||
throw new SPCInternalException("The symbol file {$symbol_file} does not exist, please check if nm command is available.");
|
throw new SPCInternalException("The symbol file {$symbol_file} does not exist, please check if nm command is available.");
|
||||||
}
|
}
|
||||||
// https://github.com/ziglang/zig/issues/24662
|
|
||||||
if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
|
||||||
return '-Wl,--export-dynamic'; // needs release 0.16, can be removed then
|
|
||||||
}
|
|
||||||
// macOS/zig
|
// macOS/zig
|
||||||
if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
||||||
return "-Wl,-exported_symbols_list,{$symbol_file}";
|
return "-Wl,-exported_symbols_list,{$symbol_file}";
|
||||||
|
|||||||
@@ -463,9 +463,10 @@ abstract class UnixBuilderBase extends BuilderBase
|
|||||||
"-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
|
"-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
|
||||||
'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
|
'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
|
||||||
], ...GoXcaddy::getEnvironment()];
|
], ...GoXcaddy::getEnvironment()];
|
||||||
|
$pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : '';
|
||||||
shell()->cd(BUILD_BIN_PATH)
|
shell()->cd(BUILD_BIN_PATH)
|
||||||
->setEnv($env)
|
->setEnv($env)
|
||||||
->exec("xcaddy build --output frankenphp {$xcaddyModules}");
|
->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
|
||||||
|
|
||||||
$this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
|
$this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace SPC\builder\unix\library;
|
namespace SPC\builder\unix\library;
|
||||||
|
|
||||||
|
use SPC\store\FileSystem;
|
||||||
use SPC\util\executor\UnixCMakeExecutor;
|
use SPC\util\executor\UnixCMakeExecutor;
|
||||||
|
|
||||||
trait curl
|
trait curl
|
||||||
@@ -32,8 +33,16 @@ trait curl
|
|||||||
)
|
)
|
||||||
->build();
|
->build();
|
||||||
|
|
||||||
// patch pkgconf
|
|
||||||
$this->patchPkgconfPrefix(['libcurl.pc']);
|
$this->patchPkgconfPrefix(['libcurl.pc']);
|
||||||
|
// On glibc <2.28 without built-in pthreads, FindThreads sets
|
||||||
|
// INTERFACE_LINK_LIBRARIES to '-lpthread'
|
||||||
|
// curls .pc generator walks and prepends '-l' to each
|
||||||
|
// entry, resulting in -l-lpthread
|
||||||
|
FileSystem::replaceFileRegex(
|
||||||
|
BUILD_LIB_PATH . '/pkgconfig/libcurl.pc',
|
||||||
|
'/-l(-l\S+)/',
|
||||||
|
'$1'
|
||||||
|
);
|
||||||
shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
|
shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
|
||||||
->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
|
->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace SPC\builder\unix\library;
|
namespace SPC\builder\unix\library;
|
||||||
|
|
||||||
|
use SPC\toolchain\ToolchainManager;
|
||||||
|
use SPC\toolchain\ZigToolchain;
|
||||||
use SPC\util\executor\UnixAutoconfExecutor;
|
use SPC\util\executor\UnixAutoconfExecutor;
|
||||||
use SPC\util\SPCConfigUtil;
|
use SPC\util\SPCConfigUtil;
|
||||||
|
|
||||||
@@ -39,12 +41,16 @@ trait krb5
|
|||||||
$extraEnv['LDFLAGS'] = '-framework Kerberos';
|
$extraEnv['LDFLAGS'] = '-framework Kerberos';
|
||||||
$args[] = 'ac_cv_func_secure_getenv=no';
|
$args[] = 'ac_cv_func_secure_getenv=no';
|
||||||
}
|
}
|
||||||
UnixAutoconfExecutor::create($this)
|
$make = UnixAutoconfExecutor::create($this)
|
||||||
->appendEnv($extraEnv)
|
->appendEnv($extraEnv)
|
||||||
->optionalLib('ldap', '--with-ldap', '--without-ldap')
|
->optionalLib('ldap', '--with-ldap', '--without-ldap')
|
||||||
->optionalLib('libedit', '--with-libedit', '--without-libedit')
|
->optionalLib('libedit', '--with-libedit', '--without-libedit')
|
||||||
->configure(...$args)
|
->configure(...$args);
|
||||||
->make();
|
|
||||||
|
if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
||||||
|
$make->exec('find . -name Makefile -exec sed -i "s/-Werror=incompatible-pointer-types//g" {} +');
|
||||||
|
}
|
||||||
|
$make->make();
|
||||||
$this->patchPkgconfPrefix([
|
$this->patchPkgconfPrefix([
|
||||||
'krb5-gssapi.pc',
|
'krb5-gssapi.pc',
|
||||||
'krb5.pc',
|
'krb5.pc',
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ trait libde265
|
|||||||
UnixCMakeExecutor::create($this)
|
UnixCMakeExecutor::create($this)
|
||||||
->addConfigureArgs(
|
->addConfigureArgs(
|
||||||
'-DENABLE_SDL=OFF',
|
'-DENABLE_SDL=OFF',
|
||||||
'-DENABLE_DECODER=OFF'
|
'-DENABLE_DECODER=OFF',
|
||||||
|
'-DHAVE_NEON=OFF',
|
||||||
)
|
)
|
||||||
->build();
|
->build();
|
||||||
$this->patchPkgconfPrefix(['libde265.pc']);
|
$this->patchPkgconfPrefix(['libde265.pc']);
|
||||||
|
|||||||
@@ -11,15 +11,28 @@ trait libheif
|
|||||||
{
|
{
|
||||||
public function patchBeforeBuild(): bool
|
public function patchBeforeBuild(): bool
|
||||||
{
|
{
|
||||||
|
$patched = false;
|
||||||
if (!str_contains(file_get_contents($this->source_dir . '/CMakeLists.txt'), 'libbrotlienc')) {
|
if (!str_contains(file_get_contents($this->source_dir . '/CMakeLists.txt'), 'libbrotlienc')) {
|
||||||
FileSystem::replaceFileStr(
|
FileSystem::replaceFileStr(
|
||||||
$this->source_dir . '/CMakeLists.txt',
|
$this->source_dir . '/CMakeLists.txt',
|
||||||
'list(APPEND REQUIRES_PRIVATE "libbrotlidec")',
|
'list(APPEND REQUIRES_PRIVATE "libbrotlidec")',
|
||||||
'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . ' list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
|
'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . ' list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
|
||||||
);
|
);
|
||||||
return true;
|
$patched = true;
|
||||||
}
|
}
|
||||||
return false;
|
// libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
|
||||||
|
$heif_properties = $this->source_dir . '/libheif/api/libheif/heif_properties.h';
|
||||||
|
if (file_exists($heif_properties)
|
||||||
|
&& str_contains(file_get_contents($heif_properties), 'struct heif_bad_pixel { uint32_t row; uint32_t column; };')
|
||||||
|
) {
|
||||||
|
FileSystem::replaceFileStr(
|
||||||
|
$heif_properties,
|
||||||
|
'struct heif_bad_pixel { uint32_t row; uint32_t column; };',
|
||||||
|
'typedef struct heif_bad_pixel { uint32_t row; uint32_t column; } heif_bad_pixel;'
|
||||||
|
);
|
||||||
|
$patched = true;
|
||||||
|
}
|
||||||
|
return $patched;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function build(): void
|
protected function build(): void
|
||||||
|
|||||||
17
src/SPC/builder/unix/library/libmpdec.php
Normal file
17
src/SPC/builder/unix/library/libmpdec.php
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace SPC\builder\unix\library;
|
||||||
|
|
||||||
|
use SPC\util\executor\UnixAutoconfExecutor;
|
||||||
|
|
||||||
|
trait libmpdec
|
||||||
|
{
|
||||||
|
protected function build(): void
|
||||||
|
{
|
||||||
|
UnixAutoconfExecutor::create($this)
|
||||||
|
->configure('--disable-cxx --disable-shared --enable-static')
|
||||||
|
->make();
|
||||||
|
}
|
||||||
|
}
|
||||||
31
src/SPC/builder/windows/library/libmpdec.php
Normal file
31
src/SPC/builder/windows/library/libmpdec.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace SPC\builder\windows\library;
|
||||||
|
|
||||||
|
class libmpdec extends WindowsLibraryBase
|
||||||
|
{
|
||||||
|
public const NAME = 'libmpdec';
|
||||||
|
|
||||||
|
protected function build(): void
|
||||||
|
{
|
||||||
|
$makefile_dir = $this->source_dir . '\libmpdec';
|
||||||
|
$nmake = $this->builder->makeSimpleWrapper('nmake /nologo');
|
||||||
|
|
||||||
|
cmd()->cd($makefile_dir)
|
||||||
|
->exec('copy /y Makefile.vc Makefile')
|
||||||
|
->execWithWrapper($nmake, 'clean')
|
||||||
|
->execWithWrapper($nmake, 'MACHINE=x64');
|
||||||
|
|
||||||
|
// Copy static lib (rename from versioned name to libmpdec_a.lib)
|
||||||
|
$libs = glob($makefile_dir . '\libmpdec-*.lib');
|
||||||
|
foreach ($libs as $lib) {
|
||||||
|
if (!str_contains($lib, '.dll.')) {
|
||||||
|
copy($lib, BUILD_LIB_PATH . '\libmpdec_a.lib');
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
copy($makefile_dir . '\mpdecimal.h', BUILD_INCLUDE_PATH . '\mpdecimal.h');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,9 +10,9 @@ class postgresql_win extends WindowsLibraryBase
|
|||||||
|
|
||||||
protected function build(): void
|
protected function build(): void
|
||||||
{
|
{
|
||||||
copy($this->source_dir . '\pgsql\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
|
copy($this->source_dir . '\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
|
||||||
copy($this->source_dir . '\pgsql\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
|
copy($this->source_dir . '\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
|
||||||
copy($this->source_dir . '\pgsql\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
|
copy($this->source_dir . '\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
|
||||||
|
|
||||||
// create libpq folder in buildroot/includes/libpq
|
// create libpq folder in buildroot/includes/libpq
|
||||||
if (!file_exists(BUILD_INCLUDE_PATH . '\libpq')) {
|
if (!file_exists(BUILD_INCLUDE_PATH . '\libpq')) {
|
||||||
@@ -21,7 +21,7 @@ class postgresql_win extends WindowsLibraryBase
|
|||||||
|
|
||||||
$headerFiles = ['libpq-fe.h', 'postgres_ext.h', 'pg_config_ext.h', 'libpq\libpq-fs.h'];
|
$headerFiles = ['libpq-fe.h', 'postgres_ext.h', 'pg_config_ext.h', 'libpq\libpq-fs.h'];
|
||||||
foreach ($headerFiles as $header) {
|
foreach ($headerFiles as $header) {
|
||||||
copy($this->source_dir . '\pgsql\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
|
copy($this->source_dir . '\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ class LinuxToolCheckList
|
|||||||
public function fixBuildTools(array $distro, array $missing): bool
|
public function fixBuildTools(array $distro, array $missing): bool
|
||||||
{
|
{
|
||||||
$install_cmd = match ($distro['dist']) {
|
$install_cmd = match ($distro['dist']) {
|
||||||
'ubuntu', 'debian', 'Deepin' => 'apt-get install -y',
|
'ubuntu', 'debian', 'linuxmint', 'Deepin' => 'apt-get install -y',
|
||||||
'alpine' => 'apk add',
|
'alpine' => 'apk add',
|
||||||
'redhat' => 'dnf install -y',
|
'redhat' => 'dnf install -y',
|
||||||
'centos' => 'yum install -y',
|
'centos' => 'yum install -y',
|
||||||
|
|||||||
@@ -98,31 +98,50 @@ class Downloader
|
|||||||
{
|
{
|
||||||
logger()->debug("finding {$name} source from github {$type} tarball");
|
logger()->debug("finding {$name} source from github {$type} tarball");
|
||||||
$source['query'] ??= '';
|
$source['query'] ??= '';
|
||||||
$data = json_decode(self::curlExec(
|
|
||||||
url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
|
|
||||||
hooks: [[CurlHook::class, 'setupGithubToken']],
|
|
||||||
retries: self::getRetryAttempts()
|
|
||||||
), true, 512, JSON_THROW_ON_ERROR);
|
|
||||||
|
|
||||||
$url = null;
|
// Use /releases/latest when possible: it returns the semantically latest stable
|
||||||
foreach ($data as $rel) {
|
// release regardless of publish order, avoiding issues with concurrent release branches.
|
||||||
if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
|
if ($type === 'releases' && empty($source['query']) && !($source['match'] ?? null)) {
|
||||||
continue;
|
$data = json_decode(self::curlExec(
|
||||||
|
url: "https://api.github.com/repos/{$source['repo']}/releases/latest",
|
||||||
|
hooks: [[CurlHook::class, 'setupGithubToken']],
|
||||||
|
retries: self::getRetryAttempts()
|
||||||
|
), true, 512, JSON_THROW_ON_ERROR);
|
||||||
|
if (!is_array($data) || empty($data['tarball_url'])) {
|
||||||
|
throw new DownloaderException("failed to find {$name} source");
|
||||||
}
|
}
|
||||||
if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) {
|
$url = $data['tarball_url'];
|
||||||
continue;
|
$version = $data['tag_name'] ?? $data['name'] ?? null;
|
||||||
|
} else {
|
||||||
|
$data = json_decode(self::curlExec(
|
||||||
|
url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
|
||||||
|
hooks: [[CurlHook::class, 'setupGithubToken']],
|
||||||
|
retries: self::getRetryAttempts()
|
||||||
|
), true, 512, JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
|
$url = null;
|
||||||
|
$version = null;
|
||||||
|
foreach ($data as $rel) {
|
||||||
|
if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!($source['match'] ?? null)) {
|
||||||
|
$url = $rel['tarball_url'] ?? null;
|
||||||
|
$version = $rel['tag_name'] ?? $rel['name'] ?? null;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
|
||||||
|
$url = $rel['tarball_url'];
|
||||||
|
$version = $rel['tag_name'] ?? $rel['name'] ?? null;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!($source['match'] ?? null)) {
|
if (!$url) {
|
||||||
$url = $rel['tarball_url'] ?? null;
|
throw new DownloaderException("failed to find {$name} source");
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
|
|
||||||
$url = $rel['tarball_url'];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!$url) {
|
|
||||||
throw new DownloaderException("failed to find {$name} source");
|
|
||||||
}
|
}
|
||||||
$headers = self::curlExec(
|
$headers = self::curlExec(
|
||||||
url: $url,
|
url: $url,
|
||||||
@@ -134,7 +153,7 @@ class Downloader
|
|||||||
if ($matches) {
|
if ($matches) {
|
||||||
$filename = $matches['filename'];
|
$filename = $matches['filename'];
|
||||||
} else {
|
} else {
|
||||||
$filename = "{$name}-" . ($type === 'releases' ? $data['tag_name'] : $data['name']) . '.tar.gz';
|
$filename = "{$name}-" . ($version ?? 'latest') . '.tar.gz';
|
||||||
}
|
}
|
||||||
|
|
||||||
return [$url, $filename];
|
return [$url, $filename];
|
||||||
|
|||||||
@@ -95,6 +95,10 @@ class SourcePatcher
|
|||||||
// patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC
|
// patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC
|
||||||
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');
|
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');
|
||||||
|
|
||||||
|
if ($builder->getPHPVersionID() >= 80300 && $builder->getPHPVersionID() < 80400) {
|
||||||
|
self::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
|
||||||
|
}
|
||||||
|
|
||||||
if ($builder->getOption('enable-micro-win32')) {
|
if ($builder->getOption('enable-micro-win32')) {
|
||||||
self::patchMicroWin32();
|
self::patchMicroWin32();
|
||||||
} else {
|
} else {
|
||||||
@@ -125,6 +129,15 @@ class SourcePatcher
|
|||||||
FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/configure', '/have_capstone="yes"/', 'have_capstone="no"');
|
FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/configure', '/have_capstone="yes"/', 'have_capstone="no"');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PHP 8.2 and below: bcmath libbcmath uses K&R style C function
|
||||||
|
if (is_unix() && $builder->getPHPVersionID() < 80300) {
|
||||||
|
FileSystem::replaceFileStr(
|
||||||
|
SOURCE_PATH . '/php-src/configure',
|
||||||
|
"for ac_arg in '' -std=gnu23",
|
||||||
|
"for ac_arg in '' -std=gnu17",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (file_exists(SOURCE_PATH . '/php-src/configure.ac.bak')) {
|
if (file_exists(SOURCE_PATH . '/php-src/configure.ac.bak')) {
|
||||||
// restore configure.ac
|
// restore configure.ac
|
||||||
FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/configure.ac');
|
FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/configure.ac');
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ class GoXcaddy extends CustomPackage
|
|||||||
'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
|
'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
|
||||||
'GOPATH' => "{$pkgroot}/go",
|
'GOPATH' => "{$pkgroot}/go",
|
||||||
])
|
])
|
||||||
->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
|
->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getEnvironment(): array
|
public static function getEnvironment(): array
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ class UnixCMakeExecutor extends Executor
|
|||||||
$target_arch = arch2gnu(php_uname('m'));
|
$target_arch = arch2gnu(php_uname('m'));
|
||||||
$cflags = getenv('SPC_DEFAULT_C_FLAGS');
|
$cflags = getenv('SPC_DEFAULT_C_FLAGS');
|
||||||
$cc = getenv('CC');
|
$cc = getenv('CC');
|
||||||
$cxx = getenv('CCX');
|
$cxx = getenv('CXX');
|
||||||
$include = BUILD_INCLUDE_PATH;
|
$include = BUILD_INCLUDE_PATH;
|
||||||
logger()->debug("making cmake tool chain file for {$os} {$target_arch} with CFLAGS='{$cflags}'");
|
logger()->debug("making cmake tool chain file for {$os} {$target_arch} with CFLAGS='{$cflags}'");
|
||||||
$root = BUILD_ROOT_PATH;
|
$root = BUILD_ROOT_PATH;
|
||||||
|
|||||||
@@ -1,17 +1,12 @@
|
|||||||
#include <sapi/embed/php_embed.h>
|
#include <sapi/embed/php_embed.h>
|
||||||
|
|
||||||
int main(int argc,char **argv){
|
int main(int argc, char **argv) {
|
||||||
|
PHP_EMBED_START_BLOCK(argc, argv)
|
||||||
PHP_EMBED_START_BLOCK(argc,argv)
|
|
||||||
|
|
||||||
zend_file_handle file_handle;
|
zend_file_handle file_handle;
|
||||||
|
zend_stream_init_filename(&file_handle, "embed.php");
|
||||||
zend_stream_init_filename(&file_handle,"embed.php");
|
if(!php_execute_script(&file_handle)) {
|
||||||
|
|
||||||
if(!php_execute_script(&file_handle)){
|
|
||||||
php_printf("Failed to execute PHP script.\n");
|
php_printf("Failed to execute PHP script.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
PHP_EMBED_END_BLOCK()
|
PHP_EMBED_END_BLOCK()
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,12 +25,16 @@ const DANGER_CMD = [
|
|||||||
// spc internal extensions
|
// spc internal extensions
|
||||||
const SPC_INTERNAL_EXTENSIONS = [
|
const SPC_INTERNAL_EXTENSIONS = [
|
||||||
'core',
|
'core',
|
||||||
|
'date',
|
||||||
'hash',
|
'hash',
|
||||||
'json',
|
'json',
|
||||||
|
'lexbor',
|
||||||
'pcre',
|
'pcre',
|
||||||
|
'random',
|
||||||
'reflection',
|
'reflection',
|
||||||
'spl',
|
'spl',
|
||||||
'standard',
|
'standard',
|
||||||
|
'uri',
|
||||||
];
|
];
|
||||||
|
|
||||||
// spc extension alias
|
// spc extension alias
|
||||||
|
|||||||
10
src/globals/ext-tests/decimal.php
Normal file
10
src/globals/ext-tests/decimal.php
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
assert(class_exists('Decimal\Decimal'));
|
||||||
|
assert(method_exists('Decimal\Decimal', 'valueOf'));
|
||||||
|
assert(0.1 + 0.2 !== 0.3);
|
||||||
|
$result = Decimal\Decimal::valueOf('0.1') + Decimal\Decimal::valueOf('0.2');
|
||||||
|
$expected = Decimal\Decimal::valueOf('0.3');
|
||||||
|
assert($result == $expected);
|
||||||
91
src/globals/patch/spc_fix_avx512_cache_before_80400.patch
Normal file
91
src/globals/patch/spc_fix_avx512_cache_before_80400.patch
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
--- a/build/php.m4
|
||||||
|
+++ b/build/php.m4
|
||||||
|
@@ -2812,27 +2812,26 @@
|
||||||
|
dnl PHP_CHECK_AVX512_SUPPORTS
|
||||||
|
dnl
|
||||||
|
AC_DEFUN([PHP_CHECK_AVX512_SUPPORTS], [
|
||||||
|
- AC_MSG_CHECKING([for avx512 supports in compiler])
|
||||||
|
- save_CFLAGS="$CFLAGS"
|
||||||
|
- CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw $CFLAGS"
|
||||||
|
-
|
||||||
|
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||||
|
- #include <immintrin.h>
|
||||||
|
- int main(void) {
|
||||||
|
- __m512i mask = _mm512_set1_epi32(0x1);
|
||||||
|
- char out[32];
|
||||||
|
- _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
|
||||||
|
- return 0;
|
||||||
|
- }]])], [
|
||||||
|
+ AC_CACHE_CHECK([whether compiler supports AVX-512], [php_cv_have_avx512], [
|
||||||
|
+ save_CFLAGS="$CFLAGS"
|
||||||
|
+ CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw $CFLAGS"
|
||||||
|
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||||
|
+ #include <immintrin.h>
|
||||||
|
+ int main(void) {
|
||||||
|
+ __m512i mask = _mm512_set1_epi32(0x1);
|
||||||
|
+ char out[32];
|
||||||
|
+ _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
|
||||||
|
+ return 0;
|
||||||
|
+ }]])],
|
||||||
|
+ [php_cv_have_avx512=yes],
|
||||||
|
+ [php_cv_have_avx512=no])
|
||||||
|
+ CFLAGS="$save_CFLAGS"
|
||||||
|
+ ])
|
||||||
|
+ if test "$php_cv_have_avx512" = "yes"; then
|
||||||
|
have_avx512_supports=1
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
- ], [
|
||||||
|
+ else
|
||||||
|
have_avx512_supports=0
|
||||||
|
- AC_MSG_RESULT([no])
|
||||||
|
- ])
|
||||||
|
-
|
||||||
|
- CFLAGS="$save_CFLAGS"
|
||||||
|
-
|
||||||
|
+ fi
|
||||||
|
AC_DEFINE_UNQUOTED([PHP_HAVE_AVX512_SUPPORTS],
|
||||||
|
[$have_avx512_supports], [Whether the compiler supports AVX512])
|
||||||
|
])
|
||||||
|
@@ -2841,24 +2840,26 @@
|
||||||
|
dnl PHP_CHECK_AVX512_VBMI_SUPPORTS
|
||||||
|
dnl
|
||||||
|
AC_DEFUN([PHP_CHECK_AVX512_VBMI_SUPPORTS], [
|
||||||
|
- AC_MSG_CHECKING([for avx512 vbmi supports in compiler])
|
||||||
|
- save_CFLAGS="$CFLAGS"
|
||||||
|
- CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw -mavx512vbmi $CFLAGS"
|
||||||
|
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||||
|
- #include <immintrin.h>
|
||||||
|
- int main(void) {
|
||||||
|
- __m512i mask = _mm512_set1_epi32(0x1);
|
||||||
|
- char out[32];
|
||||||
|
- _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));
|
||||||
|
- return 0;
|
||||||
|
- }]])], [
|
||||||
|
+ AC_CACHE_CHECK([whether compiler supports AVX-512 VBMI], [php_cv_have_avx512vbmi], [
|
||||||
|
+ save_CFLAGS="$CFLAGS"
|
||||||
|
+ CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw -mavx512vbmi $CFLAGS"
|
||||||
|
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||||
|
+ #include <immintrin.h>
|
||||||
|
+ int main(void) {
|
||||||
|
+ __m512i mask = _mm512_set1_epi32(0x1);
|
||||||
|
+ char out[32];
|
||||||
|
+ _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));
|
||||||
|
+ return 0;
|
||||||
|
+ }]])],
|
||||||
|
+ [php_cv_have_avx512vbmi=yes],
|
||||||
|
+ [php_cv_have_avx512vbmi=no])
|
||||||
|
+ CFLAGS="$save_CFLAGS"
|
||||||
|
+ ])
|
||||||
|
+ if test "$php_cv_have_avx512vbmi" = "yes"; then
|
||||||
|
have_avx512_vbmi_supports=1
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
- ], [
|
||||||
|
+ else
|
||||||
|
have_avx512_vbmi_supports=0
|
||||||
|
- AC_MSG_RESULT([no])
|
||||||
|
- ])
|
||||||
|
- CFLAGS="$save_CFLAGS"
|
||||||
|
+ fi
|
||||||
|
AC_DEFINE_UNQUOTED([PHP_HAVE_AVX512_VBMI_SUPPORTS],
|
||||||
|
[$have_avx512_vbmi_supports], [Whether the compiler supports AVX512 VBMI])
|
||||||
|
])
|
||||||
@@ -15,7 +15,7 @@ declare(strict_types=1);
|
|||||||
$test_php_version = [
|
$test_php_version = [
|
||||||
// '8.1',
|
// '8.1',
|
||||||
// '8.2',
|
// '8.2',
|
||||||
'8.3',
|
// '8.3',
|
||||||
// '8.4',
|
// '8.4',
|
||||||
'8.5',
|
'8.5',
|
||||||
// 'git',
|
// 'git',
|
||||||
@@ -23,8 +23,8 @@ $test_php_version = [
|
|||||||
|
|
||||||
// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
|
// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
|
||||||
$test_os = [
|
$test_os = [
|
||||||
'macos-15-intel', // bin/spc for x86_64
|
// 'macos-15-intel', // bin/spc for x86_64
|
||||||
'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
|
||||||
@@ -43,15 +43,15 @@ $no_strip = false;
|
|||||||
$upx = false;
|
$upx = false;
|
||||||
|
|
||||||
// whether to test frankenphp build, only available for macOS and linux
|
// whether to test frankenphp build, only available for macOS and linux
|
||||||
$frankenphp = false;
|
$frankenphp = true;
|
||||||
|
|
||||||
// prefer downloading pre-built packages to speed up the build process
|
// prefer downloading pre-built packages to speed up the build process
|
||||||
$prefer_pre_built = false;
|
$prefer_pre_built = true;
|
||||||
|
|
||||||
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
|
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
|
||||||
$extensions = match (PHP_OS_FAMILY) {
|
$extensions = match (PHP_OS_FAMILY) {
|
||||||
'Linux', 'Darwin' => 'curl,swoole',
|
'Linux', 'Darwin' => 'curl,gd',
|
||||||
'Windows' => 'intl',
|
'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib',
|
||||||
};
|
};
|
||||||
|
|
||||||
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
|
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
|
||||||
@@ -66,7 +66,7 @@ $with_suggested_libs = true;
|
|||||||
|
|
||||||
// If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
|
// If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
|
||||||
$with_libs = match (PHP_OS_FAMILY) {
|
$with_libs = match (PHP_OS_FAMILY) {
|
||||||
'Linux', 'Darwin' => 'krb5',
|
'Linux', 'Darwin' => '',
|
||||||
'Windows' => '',
|
'Windows' => '',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,15 @@ use SPC\exception\SPCInternalException;
|
|||||||
function f_exec(string $command, mixed &$output, mixed &$result_code): bool
|
function f_exec(string $command, mixed &$output, mixed &$result_code): bool
|
||||||
{
|
{
|
||||||
$result_code = 0;
|
$result_code = 0;
|
||||||
|
if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases/latest')) {
|
||||||
|
$output = explode("\n", json_encode([
|
||||||
|
'tag_name' => 'v1.1.1',
|
||||||
|
'tarball_url' => 'https://api.github.com/repos/AOMediaCodec/libavif/tarball/v1.1.1',
|
||||||
|
'prerelease' => false,
|
||||||
|
'draft' => false,
|
||||||
|
]));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases')) {
|
if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases')) {
|
||||||
$output = explode("\n", gzdecode(file_get_contents(__DIR__ . '/../assets/github_api_AOMediaCodec_libavif_releases.json.gz')));
|
$output = explode("\n", gzdecode(file_get_contents(__DIR__ . '/../assets/github_api_AOMediaCodec_libavif_releases.json.gz')));
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user