crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-04 07:15:38 +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-07 00:00:00 +07:00
parent f29ee95176 fce115d39c
commit 635fbae3c9
7 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SPC/builder/linux/LinuxBuilder.php
View File

@@ -81,7 +81,7 @@ class LinuxBuilder extends UnixBuilderBase
foreach ($libSpecs as $libName => $arr) {
$lib = $this->getLib($libName);
if ($lib === null && str_starts_with($libName, 'lib')) {
$lib = $this->getExt(substr($libName, 3));
$lib = $this->getLib(substr($libName, 3));
}
$arr = $arr ?? [];

9
src/SPC/builder/linux/library/openssl.php
View File

@@ -96,4 +96,13 @@ class openssl extends LinuxLibraryBase
FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
}
public function getStaticLibFiles(string $style = 'autoconf', bool $recursive = true): string
{
$libFiles = parent::getStaticLibFiles($style, $recursive);
if (!str_contains('-ldl -lpthread', $libFiles)) {
$libFiles .= ' -ldl -lpthread';
}
return $libFiles;
}
}