Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[aws-sdk-cpp] update port to v1.11.65 #30197

Merged
merged 1 commit into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ports/aws-sdk-cpp/compute_build_only.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,6 @@ endif()
if("mobile" IN_LIST FEATURES)
list(APPEND BUILD_ONLY mobile)
endif()
if("mobileanalytics" IN_LIST FEATURES)
list(APPEND BUILD_ONLY mobileanalytics)
endif()
if("monitoring" IN_LIST FEATURES)
list(APPEND BUILD_ONLY monitoring)
endif()
Expand Down
18 changes: 9 additions & 9 deletions ports/aws-sdk-cpp/patch-relocatable-rpath.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a653e38628..76d6067646 100644
index 41d220d5fa..f6ee9a2a74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,7 +142,6 @@ else()
endif()
# Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
# build the sdk targets
project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
@@ -147,7 +147,6 @@ if (LEGACY_BUILD)
endif ()

# Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)

# build the sdk targets
project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
3 changes: 2 additions & 1 deletion ports/aws-sdk-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
REF "${VERSION}"
SHA512 d30a9cbe67aca41e98c799b55122ff97e9a935d2073ae4c1ca6545b68719236c0f2daf665cc3c0da4210e6e24e908a7a3cd0b826242e8fb5a97763f43e92b57a
SHA512 e3fff504e8437741493451f602289010150d767f57ceb0a3aea02bf85268ddb2afb7473affa4a162aa356a410573ded50324979bf77265e81c047c861d887635
PATCHES
patch-relocatable-rpath.patch
fix-aws-root.patch
fix-openssl3.patch
lock-curl-http-and-tls-settings.patch
turn-off-warnings-as-errors.patch
)

string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
Expand Down
14 changes: 14 additions & 0 deletions ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
index a7689dc595..13e594f12c 100644
--- a/cmake/compiler_settings.cmake
+++ b/cmake/compiler_settings.cmake
@@ -153,9 +153,6 @@ macro(set_msvc_warnings)
endif()

# warnings as errors, max warning level (4)
- if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
- endif()

# taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
5 changes: 1 addition & 4 deletions ports/aws-sdk-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.11.4",
"version": "1.11.65",
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"license": "Apache-2.0",
Expand Down Expand Up @@ -585,9 +585,6 @@
"mobile": {
"description": "C++ SDK for the AWS mobile service"
},
"mobileanalytics": {
"description": "C++ SDK for the AWS mobileanalytics service"
},
"monitoring": {
"description": "C++ SDK for the AWS monitoring service"
},
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/aws-sdk-cpp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "785c086e68c5e4d5257587ee6deeae566140b8fe",
"version": "1.11.65",
"port-version": 0
},
{
"git-tree": "495471c4071406ec6929d77a553dc03ebd6df095",
"version": "1.11.4",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
"port-version": 1
},
"aws-sdk-cpp": {
"baseline": "1.11.4",
"baseline": "1.11.65",
"port-version": 0
},
"azmq": {
Expand Down