mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[aws-sdk-cpp] Fix failure to call curl[c-ares] (#38215)
Fixes https://github.com/microsoft/vcpkg/issues/36661 Fix calling curl using config mode. - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] ~~SHA512s are updated for each updated download.~~ - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [ ] ~~The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.~~ - [ ] ~~Only one version is added to each modified port's versions file.~~ Compile test pass with following triplets: ``` x64-windows arm64-osx ```
This commit is contained in:
parent
12d21d42b1
commit
43de6acd6f
31
ports/aws-sdk-cpp/fix_find_curl.patch
Normal file
31
ports/aws-sdk-cpp/fix_find_curl.patch
Normal file
@ -0,0 +1,31 @@
|
||||
diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake
|
||||
index acf16c0..3a49fb4 100644
|
||||
--- a/cmake/external_dependencies.cmake
|
||||
+++ b/cmake/external_dependencies.cmake
|
||||
@@ -80,23 +80,12 @@ if(NOT NO_HTTP_CLIENT AND NOT USE_CRT_HTTP_CLIENT)
|
||||
set(BUILD_CURL 1)
|
||||
message(STATUS " Building Curl as part of AWS SDK")
|
||||
else()
|
||||
- include(FindCURL)
|
||||
+ find_package(CURL REQUIRED)
|
||||
if(NOT CURL_FOUND)
|
||||
message(FATAL_ERROR "Could not find curl")
|
||||
+ else()
|
||||
+ set(CURL_LIBRARIES CURL::libcurl)
|
||||
endif()
|
||||
-
|
||||
- # When built from source using cmake, curl does not include
|
||||
- # CURL_INCLUDE_DIRS or CURL_INCLUDE_DIRS so we need to use
|
||||
- # find_package to fix it
|
||||
- if ("${CURL_INCLUDE_DIRS}" STREQUAL "" AND "${CURL_LIBRARIES}" STREQUAL "")
|
||||
- message(STATUS "Could not find curl include or library path, falling back to find with config.")
|
||||
- find_package(CURL)
|
||||
- set(CURL_LIBRARIES CURL::libcurl)
|
||||
- else ()
|
||||
- message(STATUS " Curl include directory: ${CURL_INCLUDE_DIRS}")
|
||||
- List(APPEND EXTERNAL_DEPS_INCLUDE_DIRS ${CURL_INCLUDE_DIRS})
|
||||
- set(CLIENT_LIBS ${CURL_LIBRARIES})
|
||||
- endif ()
|
||||
set(CLIENT_LIBS_ABSTRACT_NAME curl)
|
||||
message(STATUS " Curl target link: ${CURL_LIBRARIES}")
|
||||
endif()
|
@ -9,6 +9,7 @@ vcpkg_from_github(
|
||||
patch-relocatable-rpath.patch
|
||||
fix-aws-root.patch
|
||||
lock-curl-http-and-tls-settings.patch
|
||||
fix_find_curl.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
|
||||
|
@ -2,6 +2,7 @@
|
||||
"$note": "Automatically generated by generateFeatures.ps1",
|
||||
"name": "aws-sdk-cpp",
|
||||
"version": "1.11.285",
|
||||
"port-version": 1,
|
||||
"description": "AWS SDK for C++",
|
||||
"homepage": "https://github.com/aws/aws-sdk-cpp",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "86cda4ed313a3d7b3b6bd63cd7eb67f947e87855",
|
||||
"version": "1.11.285",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "b0cace4e0dad7294b503c00b96658252e827c3ec",
|
||||
"version": "1.11.285",
|
||||
|
@ -426,7 +426,7 @@
|
||||
},
|
||||
"aws-sdk-cpp": {
|
||||
"baseline": "1.11.285",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"azmq": {
|
||||
"baseline": "2023-03-23",
|
||||
|
Loading…
x
Reference in New Issue
Block a user