mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-16 21:35:36 +08:00
Compare commits
18 Commits
2.7.8
...
b8444070ee
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b8444070ee | ||
|
|
5b4f4f8e55 | ||
|
|
22d263c0a8 | ||
|
|
150d866c15 | ||
|
|
c051a48d56 | ||
|
|
b965ffcd82 | ||
|
|
7f863d182f | ||
|
|
d1041c57dc | ||
|
|
14b822a185 | ||
|
|
7204d277b4 | ||
|
|
5a0fd40dc4 | ||
|
|
59a6e27532 | ||
|
|
6b3b841c0e | ||
|
|
e6591ffe9c | ||
|
|
e316971764 | ||
|
|
d55278714f | ||
|
|
cb7eca9049 | ||
|
|
5b8c9e6f09 |
@@ -567,6 +567,13 @@
|
|||||||
"type": "builtin",
|
"type": "builtin",
|
||||||
"unix-only": true
|
"unix-only": true
|
||||||
},
|
},
|
||||||
|
"pcov": {
|
||||||
|
"type": "external",
|
||||||
|
"source": "pcov",
|
||||||
|
"target": [
|
||||||
|
"shared"
|
||||||
|
]
|
||||||
|
},
|
||||||
"pdo": {
|
"pdo": {
|
||||||
"type": "builtin"
|
"type": "builtin"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -771,8 +771,9 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"libwebp": {
|
"libwebp": {
|
||||||
"type": "url",
|
"type": "ghtagtar",
|
||||||
"url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
|
"repo": "webmproject/libwebp",
|
||||||
|
"match": "v1\\.\\d+\\.\\d+$",
|
||||||
"provide-pre-built": true,
|
"provide-pre-built": true,
|
||||||
"license": {
|
"license": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
@@ -780,8 +781,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"libxml2": {
|
"libxml2": {
|
||||||
"type": "url",
|
"type": "ghtagtar",
|
||||||
"url": "https://github.com/GNOME/libxml2/archive/refs/tags/v2.12.5.tar.gz",
|
"repo": "GNOME/libxml2",
|
||||||
|
"match": "v2\\.\\d+\\.\\d+$",
|
||||||
|
"provide-pre-built": false,
|
||||||
"license": {
|
"license": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "Copyright"
|
"path": "Copyright"
|
||||||
@@ -963,6 +966,15 @@
|
|||||||
"path": "LICENSE"
|
"path": "LICENSE"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"pcov": {
|
||||||
|
"type": "url",
|
||||||
|
"url": "https://pecl.php.net/get/pcov",
|
||||||
|
"filename": "pcov.tgz",
|
||||||
|
"license": {
|
||||||
|
"type": "file",
|
||||||
|
"path": "LICENSE"
|
||||||
|
}
|
||||||
|
},
|
||||||
"pdo_sqlsrv": {
|
"pdo_sqlsrv": {
|
||||||
"type": "url",
|
"type": "url",
|
||||||
"url": "https://pecl.php.net/get/pdo_sqlsrv",
|
"url": "https://pecl.php.net/get/pdo_sqlsrv",
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
|
|||||||
*/
|
*/
|
||||||
final class ConsoleApplication extends Application
|
final class ConsoleApplication extends Application
|
||||||
{
|
{
|
||||||
public const string VERSION = '2.7.8';
|
public const string VERSION = '2.7.9';
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ declare(strict_types=1);
|
|||||||
namespace SPC\builder\extension;
|
namespace SPC\builder\extension;
|
||||||
|
|
||||||
use SPC\builder\Extension;
|
use SPC\builder\Extension;
|
||||||
|
use SPC\toolchain\ToolchainManager;
|
||||||
|
use SPC\toolchain\ZigToolchain;
|
||||||
use SPC\util\CustomExt;
|
use SPC\util\CustomExt;
|
||||||
|
|
||||||
#[CustomExt('imagick')]
|
#[CustomExt('imagick')]
|
||||||
@@ -19,7 +21,9 @@ class imagick extends Extension
|
|||||||
protected function splitLibsIntoStaticAndShared(string $allLibs): array
|
protected function splitLibsIntoStaticAndShared(string $allLibs): array
|
||||||
{
|
{
|
||||||
[$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
|
[$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
|
||||||
if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
|
if (ToolchainManager::getToolchainClass() !== ZigToolchain::class &&
|
||||||
|
(str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset'))
|
||||||
|
) {
|
||||||
$static .= ' -l:libstdc++.a';
|
$static .= ' -l:libstdc++.a';
|
||||||
$shared = str_replace('-lstdc++', '', $shared);
|
$shared = str_replace('-lstdc++', '', $shared);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ 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('maxminddb')]
|
#[CustomExt('maxminddb')]
|
||||||
@@ -12,15 +13,13 @@ class maxminddb extends Extension
|
|||||||
{
|
{
|
||||||
public function patchBeforeBuildconf(): bool
|
public function patchBeforeBuildconf(): bool
|
||||||
{
|
{
|
||||||
if (!is_link(SOURCE_PATH . '/php-src/ext/maxminddb')) {
|
if (!is_dir(SOURCE_PATH . '/php-src/ext/maxminddb')) {
|
||||||
$original = $this->source_dir;
|
$original = $this->source_dir;
|
||||||
if (PHP_OS_FAMILY === 'Windows') {
|
FileSystem::copyDir($original . '/ext', SOURCE_PATH . '/php-src/ext/maxminddb');
|
||||||
f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && mklink /D maxminddb ' . $original . '\ext');
|
$this->source_dir = SOURCE_PATH . '/php-src/ext/maxminddb';
|
||||||
} else {
|
|
||||||
f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && ln -s ' . $original . '/ext maxminddb');
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
$this->source_dir = SOURCE_PATH . '/php-src/ext/maxminddb';
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ class openssl extends LinuxLibraryBase
|
|||||||
"{$zlib_extra}" .
|
"{$zlib_extra}" .
|
||||||
'enable-pie ' .
|
'enable-pie ' .
|
||||||
'no-legacy ' .
|
'no-legacy ' .
|
||||||
|
'no-tests ' .
|
||||||
"linux-{$arch}"
|
"linux-{$arch}"
|
||||||
)
|
)
|
||||||
->exec('make clean')
|
->exec('make clean')
|
||||||
|
|||||||
@@ -29,13 +29,17 @@ trait libjxl
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
|
||||||
$cmake->addConfigureArgs(
|
$cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
|
||||||
'-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
|
$has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
|
||||||
'-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
|
if (!$has_avx512) {
|
||||||
'-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
|
$cmake->addConfigureArgs(
|
||||||
'-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
|
'-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
|
||||||
'-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE'
|
'-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
|
||||||
);
|
'-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
|
||||||
|
'-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
|
||||||
|
'-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE'
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$cmake->build();
|
$cmake->build();
|
||||||
|
|||||||
@@ -5,13 +5,26 @@ declare(strict_types=1);
|
|||||||
namespace SPC\builder\unix\library;
|
namespace SPC\builder\unix\library;
|
||||||
|
|
||||||
use SPC\util\executor\UnixCMakeExecutor;
|
use SPC\util\executor\UnixCMakeExecutor;
|
||||||
|
use SPC\util\SPCTarget;
|
||||||
|
|
||||||
trait libwebp
|
trait libwebp
|
||||||
{
|
{
|
||||||
protected function build(): void
|
protected function build(): void
|
||||||
{
|
{
|
||||||
UnixCMakeExecutor::create($this)
|
UnixCMakeExecutor::create($this)
|
||||||
->addConfigureArgs('-DWEBP_BUILD_EXTRAS=ON')
|
->addConfigureArgs(
|
||||||
|
'-DWEBP_BUILD_EXTRAS=OFF',
|
||||||
|
'-DWEBP_BUILD_ANIM_UTILS=OFF',
|
||||||
|
'-DWEBP_BUILD_CWEBP=OFF',
|
||||||
|
'-DWEBP_BUILD_DWEBP=OFF',
|
||||||
|
'-DWEBP_BUILD_GIF2WEBP=OFF',
|
||||||
|
'-DWEBP_BUILD_IMG2WEBP=OFF',
|
||||||
|
'-DWEBP_BUILD_VWEBP=OFF',
|
||||||
|
'-DWEBP_BUILD_WEBPINFO=OFF',
|
||||||
|
'-DWEBP_BUILD_WEBPMUX=OFF',
|
||||||
|
'-DWEBP_BUILD_FUZZTEST=OFF',
|
||||||
|
SPCTarget::getLibcVersion() === '2.31' && GNU_ARCH === 'x86_64' ? '-DWEBP_ENABLE_SIMD=OFF' : '' // fix an edge bug for debian 11 with gcc 10
|
||||||
|
)
|
||||||
->build();
|
->build();
|
||||||
// patch pkgconfig
|
// patch pkgconfig
|
||||||
$this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);
|
$this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);
|
||||||
|
|||||||
@@ -660,11 +660,19 @@ class FileSystem
|
|||||||
$source = self::convertPath($source);
|
$source = self::convertPath($source);
|
||||||
$dest = self::convertPath($dest);
|
$dest = self::convertPath($dest);
|
||||||
|
|
||||||
// Try rename first (fast, atomic)
|
// Check if source and dest are on the same device to avoid cross-device rename errors
|
||||||
if (@rename($source, $dest)) {
|
$source_stat = @stat($source);
|
||||||
return;
|
$dest_parent = dirname($dest);
|
||||||
|
$dest_stat = @stat($dest_parent);
|
||||||
|
|
||||||
|
// Only use rename if on same device
|
||||||
|
if ($source_stat !== false && $dest_stat !== false && $source_stat['dev'] === $dest_stat['dev']) {
|
||||||
|
if (@rename($source, $dest)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fall back to copy + delete for cross-device moves or if rename failed
|
||||||
if (is_dir($source)) {
|
if (is_dir($source)) {
|
||||||
self::copyDir($source, $dest);
|
self::copyDir($source, $dest);
|
||||||
self::removeDir($source);
|
self::removeDir($source);
|
||||||
|
|||||||
@@ -48,10 +48,10 @@ class GoXcaddy extends CustomPackage
|
|||||||
'macos' => 'darwin',
|
'macos' => 'darwin',
|
||||||
default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
|
default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
|
||||||
};
|
};
|
||||||
$go_version = '1.25.0';
|
[$go_version] = explode("\n", Downloader::curlExec('https://go.dev/VERSION?m=text'));
|
||||||
$config = [
|
$config = [
|
||||||
'type' => 'url',
|
'type' => 'url',
|
||||||
'url' => "https://go.dev/dl/go{$go_version}.{$os}-{$arch}.tar.gz",
|
'url' => "https://go.dev/dl/{$go_version}.{$os}-{$arch}.tar.gz",
|
||||||
];
|
];
|
||||||
Downloader::downloadPackage($name, $config, $force);
|
Downloader::downloadPackage($name, $config, $force);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
// test php version (8.1 ~ 8.4 available, multiple for matrix)
|
// test php version (8.1 ~ 8.4 available, multiple for matrix)
|
||||||
$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',
|
||||||
@@ -25,17 +25,17 @@ $test_php_version = [
|
|||||||
$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
|
||||||
'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
|
// 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
|
||||||
'ubuntu-24.04-arm', // bin/spc for arm64
|
'ubuntu-24.04-arm', // bin/spc for arm64
|
||||||
// 'windows-2022', // .\bin\spc.ps1
|
// 'windows-2022', // .\bin\spc.ps1
|
||||||
// 'windows-2025',
|
// 'windows-2025',
|
||||||
];
|
];
|
||||||
|
|
||||||
// whether enable thread safe
|
// whether enable thread safe
|
||||||
$zts = false;
|
$zts = true;
|
||||||
|
|
||||||
$no_strip = false;
|
$no_strip = false;
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ $prefer_pre_built = false;
|
|||||||
|
|
||||||
// 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' => 'maxminddb',
|
'Linux', 'Darwin' => 'bcmath,xsl,xml',
|
||||||
'Windows' => 'bcmath',
|
'Windows' => 'bcmath',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user