add -lpthread and -ldl in openssl::getStaticLibFiles

This commit is contained in:
DubbleClick 2025-06-06 16:56:08 +07:00
parent 92ad792eff
commit 617b0de31f
4 changed files with 15 additions and 4 deletions

View File

@ -654,7 +654,8 @@
"openssl"
],
"lib-suggests": [
"nghttp3"
"nghttp3",
"brotli"
]
},
"onig": {

View File

@ -92,4 +92,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;
}
}

View File

@ -56,7 +56,7 @@ class MacOSBuilder extends UnixBuilderBase
foreach ($lib_specs 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 ?? [];

View File

@ -23,8 +23,9 @@ trait ngtcp2
'jemalloc' => null,
'libnghttp3' => null,
]);
if (PHP_OS_FAMILY === 'Linux') {
$args = preg_replace('/OPENSSL_LIBS="(.*?)"/', 'OPENSSL_LIBS="\1 -lpthread -ldl"', $args);
if ($brotli = $this->builder->getLib('brotli')) {
$args .= ' --with-libbrotlidec=yes LIBBROTLIDEC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIDEC_LIBS="' . $brotli->getStaticLibFiles() . '"';
$args .= ' --with-libbrotlienc=yes LIBBROTLIENC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIENC_LIBS="' . $brotli->getStaticLibFiles() . '"';
}
shell()->cd($this->source_dir)