luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: skip CA-path/bundle auto-detection in cross-builds

Browse Source 
Also remove issue from KNOWN_BUGS.

Reported-by: Cristian Morales Vega
Reviewed-by: Marcel Raad
Fixes #6178
Closes #10676
This commit is contained in:
Viktor Szakats 2023-03-05 19:51:52 +00:00
parent e135bc9d31
commit 016c62c4d5
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -870,7 +870,9 @@ elseif("${CURL_CA_BUNDLE}" STREQUAL "none")
unset(CURL_CA_BUNDLE CACHE)
elseif("${CURL_CA_BUNDLE}" STREQUAL "auto")
unset(CURL_CA_BUNDLE CACHE)
set(CURL_CA_BUNDLE_AUTODETECT TRUE)
if(NOT CMAKE_CROSSCOMPILING)
set(CURL_CA_BUNDLE_AUTODETECT TRUE)
endif()
else()
set(CURL_CA_BUNDLE_SET TRUE)
endif()
@ -881,7 +883,7 @@ elseif("${CURL_CA_PATH}" STREQUAL "none")
unset(CURL_CA_PATH CACHE)
elseif("${CURL_CA_PATH}" STREQUAL "auto")
unset(CURL_CA_PATH CACHE)
if(NOT USE_NSS)
if(NOT CMAKE_CROSSCOMPILING AND NOT USE_NSS)
set(CURL_CA_PATH_AUTODETECT TRUE)
endif()
else()

8
docs/KNOWN_BUGS
View File

@ -107,7 +107,6 @@ problems may have been fixed or changed somewhat since this was written.
15.6 uses -lpthread instead of Threads::Threads
15.7 generated .pc file contains strange entries
15.8 libcurl.pc uses absolute library paths
15.9 cert paths autodetected when cross-compiling
15.10 libpsl is not supported
15.11 ExternalProject_Add does not set CURL_CA_PATH
15.12 cannot enable LDAPS on Windows
@ -684,13 +683,6 @@ problems may have been fixed or changed somewhat since this was written.
See https://github.com/curl/curl/issues/6169
15.9 cert paths autodetected when cross-compiling
The autotools build disables the ca_path/ca_bundle detection when
cross-compiling. The cmake build keeps doing the detection.
See https://github.com/curl/curl/issues/6178
15.10 libpsl is not supported
See https://github.com/curl/curl/issues/6214