Skip to content

Commit d8ae79d

Browse files
committed
Patch aws-sdk-cpp to fix failures to find curl.
1 parent 6bb5a35 commit d8ae79d

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

ports/README.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ $ git commit
2626

2727
After copying the port, add an entry to the table below. You should also contribute your changes to vcpkg and/or the upstream package repository.
2828

29+
For ease of review when patching existing ports, you are recommended to make one commit that copies the upstream port unchanged, and another commit that makes the changes you need.
30+
2931
## List of port overlays
3032

31-
| Port | Reason |
32-
|---------------|------------------------------------------------------------------|
33-
| `libmagic` | Updating to the upstream port deferred due to failures. |
34-
| `openssl` | Pinning to OpenSSL 1.1 until we can move to 3.0 in January 2024. |
35-
| `libfaketime` | Port does not yet exist upstream |
33+
| Port | Reason |
34+
|---------------|---------------------------------------------------------------------------------------|
35+
| `aws-sdk-cpp` | Patching to fix failures to find curl (https://github.com/aws/aws-sdk-cpp/pull/2974). |
36+
| `libmagic` | Updating to the upstream port deferred due to failures. |
37+
| `openssl` | Pinning to OpenSSL 1.1 until we can move to 3.0 in January 2024. |
38+
| `libfaketime` | Port does not yet exist upstream |
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/toolchains/core-config.cmake b/toolchains/core-config.cmake
2+
index d90bfaf747..ab14402577 100644
3+
--- a/toolchains/core-config.cmake
4+
+++ b/toolchains/core-config.cmake
5+
@@ -15,5 +15,8 @@ if (AWSSDK_CRYPTO_IN_SOURCE_BUILD)
6+
find_dependency(crypto)
7+
find_dependency(ssl)
8+
endif()
9+
+if("@ENABLE_CURL_CLIENT@")
10+
+ find_dependency(CURL)
11+
+endif()
12+
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_PREV})
13+
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")

ports/aws-sdk-cpp/portfile.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ vcpkg_from_github(
1010
fix-aws-root.patch
1111
lock-curl-http-and-tls-settings.patch
1212
fix_find_curl.patch
13+
find-dependency-curl.patch
1314
)
1415

1516
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)

0 commit comments

Comments
 (0)