mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-09 01:45:36 +08:00
Fix curl exe build on windows
This commit is contained in:
@@ -39,7 +39,7 @@ class curl
|
|||||||
->optionalPackage('zstd', ...cmake_boolean_args('CURL_ZSTD'))
|
->optionalPackage('zstd', ...cmake_boolean_args('CURL_ZSTD'))
|
||||||
->optionalPackage('brotli', ...cmake_boolean_args('CURL_BROTLI'))
|
->optionalPackage('brotli', ...cmake_boolean_args('CURL_BROTLI'))
|
||||||
->addConfigureArgs(
|
->addConfigureArgs(
|
||||||
'-DBUILD_CURL_EXE=OFF',
|
'-DBUILD_CURL_EXE=ON',
|
||||||
'-DZSTD_LIBRARY=zstd_static.lib',
|
'-DZSTD_LIBRARY=zstd_static.lib',
|
||||||
'-DBUILD_TESTING=OFF',
|
'-DBUILD_TESTING=OFF',
|
||||||
'-DBUILD_EXAMPLES=OFF',
|
'-DBUILD_EXAMPLES=OFF',
|
||||||
@@ -81,6 +81,7 @@ class curl
|
|||||||
->addConfigureArgs(
|
->addConfigureArgs(
|
||||||
'-DBUILD_CURL_EXE=ON',
|
'-DBUILD_CURL_EXE=ON',
|
||||||
'-DBUILD_LIBCURL_DOCS=OFF',
|
'-DBUILD_LIBCURL_DOCS=OFF',
|
||||||
|
'-DOPENSSL_ROOT_DIR=' . BUILD_ROOT_PATH,
|
||||||
)
|
)
|
||||||
->build();
|
->build();
|
||||||
|
|
||||||
@@ -92,6 +93,9 @@ class curl
|
|||||||
if (str_contains(FileSystem::readFile($pc_path), '-lgssapi_krb5')) {
|
if (str_contains(FileSystem::readFile($pc_path), '-lgssapi_krb5')) {
|
||||||
FileSystem::replaceFileRegex($pc_path, '/-lcom_err$/m', '-lcom_err -lkrb5support');
|
FileSystem::replaceFileRegex($pc_path, '/-lcom_err$/m', '-lcom_err -lkrb5support');
|
||||||
}
|
}
|
||||||
|
// FindThreads can put '-lpthread' into INTERFACE_LINK_LIBRARIES; curl's pc generator
|
||||||
|
// prepends '-l' to each entry, producing '-l-lpthread'. Strip the extra '-l'.
|
||||||
|
FileSystem::replaceFileRegex($pc_path, '/-l(-l\S+)/', '$1');
|
||||||
shell()->cd("{$lib->getLibDir()}/cmake/CURL/")
|
shell()->cd("{$lib->getLibDir()}/cmake/CURL/")
|
||||||
->exec("sed -ie 's|\"/lib/libcurl.a\"|\"{$lib->getLibDir()}/libcurl.a\"|g' CURLTargets-release.cmake");
|
->exec("sed -ie 's|\"/lib/libcurl.a\"|\"{$lib->getLibDir()}/libcurl.a\"|g' CURLTargets-release.cmake");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user