crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-07 08:45:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into fix/icurel

Browse Source
This commit is contained in:
DubbleClick
2025-06-05 16:48:47 +07:00
parent e2191113b0 ab4e0bc406
commit ad8581db97
5 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/SPC/builder/unix/library/curl.php
View File

@@ -18,7 +18,15 @@ trait curl
{
$extra = '';
// lib:openssl
$extra .= $this->builder->getLib('openssl') ? '-DCURL_USE_OPENSSL=ON ' : '-DCURL_USE_OPENSSL=OFF -DCURL_ENABLE_SSL=OFF ';
if ($this->builder->getLib('openssl')) {
$extra .=
'-DCURL_USE_OPENSSL=ON ' .
'-DCURL_CA_BUNDLE=OFF ' .
'-DCURL_CA_PATH=OFF ' .
'-DCURL_CA_FALLBACK=ON ';
} else {
$extra .= '-DCURL_USE_OPENSSL=OFF -DCURL_ENABLE_SSL=OFF ';
}
// lib:brotli
$extra .= $this->builder->getLib('brotli') ? '-DCURL_BROTLI=ON ' : '-DCURL_BROTLI=OFF ';
// lib:libssh2

13
src/SPC/builder/unix/library/freetype.php
View File

@@ -18,9 +18,13 @@ trait freetype
*/
protected function build(): void
{
$extra_libs = $this->builder->getLib('libpng') ? '-DFT_DISABLE_PNG=OFF ' : '-DFT_DISABLE_PNG=ON ';
$extra_libs .= $this->builder->getLib('bzip2') ? '-DFT_DISABLE_BZIP2=OFF ' : '-DFT_DISABLE_BZIP2=ON ';
$extra_libs .= $this->builder->getLib('brotli') ? '-DFT_DISABLE_BROTLI=OFF ' : '-DFT_DISABLE_BROTLI=ON ';
$extra = '';
if (version_compare(get_cmake_version(), '4.0.0', '>=')) {
$extra .= '-DCMAKE_POLICY_VERSION_MINIMUM=3.12 ';
}
$extra .= $this->builder->getLib('libpng') ? '-DFT_DISABLE_PNG=OFF ' : '-DFT_DISABLE_PNG=ON ';
$extra .= $this->builder->getLib('bzip2') ? '-DFT_DISABLE_BZIP2=OFF ' : '-DFT_DISABLE_BZIP2=ON ';
$extra .= $this->builder->getLib('brotli') ? '-DFT_DISABLE_BROTLI=OFF ' : '-DFT_DISABLE_BROTLI=ON ';
FileSystem::resetDir($this->source_dir . '/build');
shell()->cd($this->source_dir . '/build')
->setEnv([
@@ -31,8 +35,7 @@ trait freetype
->execWithEnv(
"cmake {$this->builder->makeCmakeArgs()} -DFT_DISABLE_HARFBUZZ=ON " .
'-DBUILD_SHARED_LIBS=OFF ' .
'-DPOSITION_INDEPENDENT_CODE=ON ' .
"{$extra_libs}.."
"{$extra}.."
)
->execWithEnv('make clean')
->execWithEnv("make -j{$this->builder->concurrency}")