Bump the baseline again to get newer AWS and Google Cloud SDK verisons.

The custom AWS SDK port is no longer needed; the patch has been upstreamed to vcpkg.
TileDB-Inc · Jul 1, 2024 · d1ddee5 · d1ddee5
1 parent 5883c9d
commit d1ddee5
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 1,576 deletions.
diff --git a/cmake/Options/TileDBToolchain.cmake b/cmake/Options/TileDBToolchain.cmake
@@ -45,7 +45,7 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)
         # Inspired from https://github.com/Azure/azure-sdk-for-cpp/blob/azure-core_1.10.3/cmake-modules/AzureVcpkg.cmake
         message("TILEDB_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
         # To help with resolving conflicts, when you update the commit, also update its date.
-        set(VCPKG_COMMIT_STRING 01f602195983451bc83e72f4214af2cbc495aa94) # 2024-05-25
+        set(VCPKG_COMMIT_STRING 101cc9a69a1061969caf4b73579a34873fdd60fe) # 2024-07-01
         message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}")
         include(FetchContent)
         FetchContent_Declare(

diff --git a/ports/README.md b/ports/README.md
@@ -30,9 +30,8 @@ For ease of review when patching existing ports, you are recommended to make one
 
 ## List of port overlays
 
-| 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                                                      |
+| 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                                 |
diff --git a/ports/aws-sdk-cpp/find-dependency-curl.patch b/ports/aws-sdk-cpp/find-dependency-curl.patch
diff --git a/ports/aws-sdk-cpp/fix-aws-root.patch b/ports/aws-sdk-cpp/fix-aws-root.patch
diff --git a/ports/aws-sdk-cpp/fix_find_curl.patch b/ports/aws-sdk-cpp/fix_find_curl.patch
diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1
diff --git a/ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch b/ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch
diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage
diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json