Skip to content

Commit

Permalink
Patch aws-sdk-cpp to fix failures to find curl.
Browse files Browse the repository at this point in the history
  • Loading branch information
teo-tsirpanis committed Jun 18, 2024
1 parent 6bb5a35 commit d8ae79d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
13 changes: 8 additions & 5 deletions ports/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ $ git commit

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.

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.

## List of port overlays

| Port | Reason |
|---------------|------------------------------------------------------------------|
| `libmagic` | Updating to the upstream port deferred due to failures. |
| `openssl` | Pinning to OpenSSL 1.1 until we can move to 3.0 in January 2024. |
| `libfaketime` | Port does not yet exist upstream |
| Port | Reason |
|---------------|---------------------------------------------------------------------------------------|
| `aws-sdk-cpp` | Patching to fix failures to find curl (https://github.com/aws/aws-sdk-cpp/pull/2974). |
| `libmagic` | Updating to the upstream port deferred due to failures. |
| `openssl` | Pinning to OpenSSL 1.1 until we can move to 3.0 in January 2024. |
| `libfaketime` | Port does not yet exist upstream |
13 changes: 13 additions & 0 deletions ports/aws-sdk-cpp/find-dependency-curl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/toolchains/core-config.cmake b/toolchains/core-config.cmake
index d90bfaf747..ab14402577 100644
--- a/toolchains/core-config.cmake
+++ b/toolchains/core-config.cmake
@@ -15,5 +15,8 @@ if (AWSSDK_CRYPTO_IN_SOURCE_BUILD)
find_dependency(crypto)
find_dependency(ssl)
endif()
+if("@ENABLE_CURL_CLIENT@")
+ find_dependency(CURL)
+endif()
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_PREV})
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
1 change: 1 addition & 0 deletions ports/aws-sdk-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
fix-aws-root.patch
lock-curl-http-and-tls-settings.patch
fix_find_curl.patch
find-dependency-curl.patch
)

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

0 comments on commit d8ae79d

Please sign in to comment.