This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new ce92b805f [GLUTEN-5773][VL] Update aws-sdk-cpp version to 1.11.285
(from 1.11.169) (#5774)
ce92b805f is described below
commit ce92b805fe6fc34c463b40dee42f5a7b83525e6c
Author: Yan Ma <[email protected]>
AuthorDate: Tue May 21 12:42:51 2024 +0800
[GLUTEN-5773][VL] Update aws-sdk-cpp version to 1.11.285 (from 1.11.169)
(#5774)
---
dev/vcpkg/ports/aws-sdk-cpp/fix-header.patch | 12 ----
dev/vcpkg/ports/aws-sdk-cpp/fix_find_curl.patch | 31 +++++++++++
dev/vcpkg/ports/aws-sdk-cpp/portfile.cmake | 18 +++---
dev/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json | 2 +-
dev/vcpkg/ports/aws-sdk-cpp/vcpkg.json | 73 ++++++++++++++++++++++---
5 files changed, 107 insertions(+), 29 deletions(-)
diff --git a/dev/vcpkg/ports/aws-sdk-cpp/fix-header.patch
b/dev/vcpkg/ports/aws-sdk-cpp/fix-header.patch
deleted file mode 100644
index be4511ada..000000000
--- a/dev/vcpkg/ports/aws-sdk-cpp/fix-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/aws-cpp-sdk-core/include/aws/core/Aws.h
b/src/aws-cpp-sdk-core/include/aws/core/Aws.h
-index 5c27e75a84c..d221af2039b 100644
---- a/src/aws-cpp-sdk-core/include/aws/core/Aws.h
-+++ b/src/aws-cpp-sdk-core/include/aws/core/Aws.h
-@@ -12,6 +12,7 @@
- #include <aws/core/http/HttpClientFactory.h>
- #include <aws/core/monitoring/MonitoringManager.h>
- #include <aws/core/Core_EXPORTS.h>
-+#include <aws/core/VersionConfig.h>
- #include <aws/crt/io/Bootstrap.h>
- #include <aws/crt/io/TlsOptions.h>
-
diff --git a/dev/vcpkg/ports/aws-sdk-cpp/fix_find_curl.patch
b/dev/vcpkg/ports/aws-sdk-cpp/fix_find_curl.patch
new file mode 100644
index 000000000..6f32da025
--- /dev/null
+++ b/dev/vcpkg/ports/aws-sdk-cpp/fix_find_curl.patch
@@ -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()
++ message(STATUS " Curl library: ${CURL_LIBRARIES}")
+ 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()
diff --git a/dev/vcpkg/ports/aws-sdk-cpp/portfile.cmake
b/dev/vcpkg/ports/aws-sdk-cpp/portfile.cmake
index ac3f2292b..71e701486 100644
--- a/dev/vcpkg/ports/aws-sdk-cpp/portfile.cmake
+++ b/dev/vcpkg/ports/aws-sdk-cpp/portfile.cmake
@@ -4,18 +4,18 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
REF "${VERSION}"
- SHA512
63de900870e9bec23d42e9458e0e9b1579a9e2dc7b0f404eae1b0dd406898b6d6841c5e2f498710b3828f212705437da3a2fe94813a6c3a842945100a05ae368
+ SHA512
826be806ddd87eb452f97df70b19df4194e984775408d8f99246244b6949abcab583e4cbe1ae3bc5d61f3c78267d0e75ea9e69956188ab12e0318344a4314591
PATCHES
patch-relocatable-rpath.patch
fix-aws-root.patch
lock-curl-http-and-tls-settings.patch
fix-awsmigrationhub-build.patch
- fix-header.patch
+ fix_find_curl.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
-set(EXTRA_ARGS)
+set(EXTRA_ARGS "")
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
set(rpath "@loader_path")
elseif (VCPKG_TARGET_IS_ANDROID)
@@ -31,6 +31,7 @@ else()
set(rpath "\$ORIGIN")
endif()
+string(REPLACE "awsmigrationhub" "AWSMigrationHub" targets "${FEATURES}")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
@@ -39,7 +40,7 @@ vcpkg_cmake_configure(
"-DENABLE_UNITY_BUILD=ON"
"-DENABLE_TESTING=OFF"
"-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
- "-DBUILD_ONLY=${FEATURES}"
+ "-DBUILD_ONLY=${targets}"
"-DBUILD_DEPS=OFF"
"-DBUILD_SHARED_LIBS=OFF"
"-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF"
@@ -48,10 +49,11 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
-foreach(TARGET IN LISTS FEATURES)
- vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH
"lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+foreach(TARGET IN LISTS targets)
+ string(TOLOWER "aws-cpp-sdk-${TARGET}" package)
+ vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" CONFIG_PATH
"lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
-vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")
+vcpkg_cmake_config_fixup(PACKAGE_NAME "awssdk" CONFIG_PATH "lib/cmake/AWSSDK")
vcpkg_copy_pdbs()
@@ -81,7 +83,7 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/nuget"
)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib)
if(LIB_FILES)
file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
diff --git a/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json
b/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json
index a618a77d8..3eb486f73 100644
--- a/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json
+++ b/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json
@@ -1,6 +1,6 @@
{
"name": "aws-sdk-cpp",
- "version": "1.11.160",
+ "version": "1.11.215",
"port-version": 1,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp";,
diff --git a/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.json
b/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.json
index 138894a9e..93df56095 100644
--- a/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.json
+++ b/dev/vcpkg/ports/aws-sdk-cpp/vcpkg.json
@@ -1,8 +1,8 @@
{
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
- "version": "1.11.169",
- "port-version": 2,
+ "version": "1.11.285",
+ "port-version": 1,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp";,
"license": "Apache-2.0",
@@ -143,6 +143,9 @@
"awstransfer": {
"description": "C++ SDK for the AWS awstransfer service"
},
+ "b2bi": {
+ "description": "C++ SDK for the AWS b2bi service"
+ },
"backup": {
"description": "C++ SDK for the AWS backup service"
},
@@ -155,6 +158,21 @@
"batch": {
"description": "C++ SDK for the AWS batch service"
},
+ "bcm-data-exports": {
+ "description": "C++ SDK for the AWS bcm-data-exports service"
+ },
+ "bedrock": {
+ "description": "C++ SDK for the AWS bedrock service"
+ },
+ "bedrock-agent": {
+ "description": "C++ SDK for the AWS bedrock-agent service"
+ },
+ "bedrock-agent-runtime": {
+ "description": "C++ SDK for the AWS bedrock-agent-runtime service"
+ },
+ "bedrock-runtime": {
+ "description": "C++ SDK for the AWS bedrock-runtime service"
+ },
"billingconductor": {
"description": "C++ SDK for the AWS billingconductor service"
},
@@ -188,6 +206,9 @@
"cleanrooms": {
"description": "C++ SDK for the AWS cleanrooms service"
},
+ "cleanroomsml": {
+ "description": "C++ SDK for the AWS cleanroomsml service"
+ },
"cloud9": {
"description": "C++ SDK for the AWS cloud9 service"
},
@@ -203,6 +224,9 @@
"cloudfront": {
"description": "C++ SDK for the AWS cloudfront service"
},
+ "cloudfront-keyvaluestore": {
+ "description": "C++ SDK for the AWS cloudfront-keyvaluestore service"
+ },
"cloudhsm": {
"description": "C++ SDK for the AWS cloudhsm service"
},
@@ -296,6 +320,9 @@
"controltower": {
"description": "C++ SDK for the AWS controltower service"
},
+ "cost-optimization-hub": {
+ "description": "C++ SDK for the AWS cost-optimization-hub service"
+ },
"cur": {
"description": "C++ SDK for the AWS cur service"
},
@@ -314,6 +341,9 @@
"datasync": {
"description": "C++ SDK for the AWS datasync service"
},
+ "datazone": {
+ "description": "C++ SDK for the AWS datazone service"
+ },
"dax": {
"description": "C++ SDK for the AWS dax service"
},
@@ -377,6 +407,9 @@
"eks": {
"description": "C++ SDK for the AWS eks service"
},
+ "eks-auth": {
+ "description": "C++ SDK for the AWS eks-auth service"
+ },
"elastic-inference": {
"description": "C++ SDK for the AWS elastic-inference service"
},
@@ -449,15 +482,15 @@
"frauddetector": {
"description": "C++ SDK for the AWS frauddetector service"
},
+ "freetier": {
+ "description": "C++ SDK for the AWS freetier service"
+ },
"fsx": {
"description": "C++ SDK for the AWS fsx service"
},
"gamelift": {
"description": "C++ SDK for the AWS gamelift service"
},
- "gamesparks": {
- "description": "C++ SDK for the AWS gamesparks service"
- },
"glacier": {
"description": "C++ SDK for the AWS glacier service"
},
@@ -519,6 +552,9 @@
"inspector": {
"description": "C++ SDK for the AWS inspector service"
},
+ "inspector-scan": {
+ "description": "C++ SDK for the AWS inspector-scan service"
+ },
"inspector2": {
"description": "C++ SDK for the AWS inspector2 service"
},
@@ -633,6 +669,9 @@
"lambda": {
"description": "C++ SDK for the AWS lambda service"
},
+ "launch-wizard": {
+ "description": "C++ SDK for the AWS launch-wizard service"
+ },
"lex": {
"description": "C++ SDK for the AWS lex service"
},
@@ -678,9 +717,6 @@
"machinelearning": {
"description": "C++ SDK for the AWS machinelearning service"
},
- "macie": {
- "description": "C++ SDK for the AWS macie service"
- },
"macie2": {
"description": "C++ SDK for the AWS macie2 service"
},
@@ -690,9 +726,15 @@
"managedblockchain-query": {
"description": "C++ SDK for the AWS managedblockchain-query service"
},
+ "marketplace-agreement": {
+ "description": "C++ SDK for the AWS marketplace-agreement service"
+ },
"marketplace-catalog": {
"description": "C++ SDK for the AWS marketplace-catalog service"
},
+ "marketplace-deployment": {
+ "description": "C++ SDK for the AWS marketplace-deployment service"
+ },
"marketplace-entitlement": {
"description": "C++ SDK for the AWS marketplace-entitlement service"
},
@@ -855,6 +897,12 @@
"proton": {
"description": "C++ SDK for the AWS proton service"
},
+ "qbusiness": {
+ "description": "C++ SDK for the AWS qbusiness service"
+ },
+ "qconnect": {
+ "description": "C++ SDK for the AWS qconnect service"
+ },
"qldb": {
"description": "C++ SDK for the AWS qldb service"
},
@@ -900,6 +948,9 @@
"rekognition": {
"description": "C++ SDK for the AWS rekognition service"
},
+ "repostspace": {
+ "description": "C++ SDK for the AWS repostspace service"
+ },
"resiliencehub": {
"description": "C++ SDK for the AWS resiliencehub service"
},
@@ -1138,6 +1189,9 @@
"translate": {
"description": "C++ SDK for the AWS translate service"
},
+ "trustedadvisor": {
+ "description": "C++ SDK for the AWS trustedadvisor service"
+ },
"verifiedpermissions": {
"description": "C++ SDK for the AWS verifiedpermissions service"
},
@@ -1177,6 +1231,9 @@
"workspaces": {
"description": "C++ SDK for the AWS workspaces service"
},
+ "workspaces-thin-client": {
+ "description": "C++ SDK for the AWS workspaces-thin-client service"
+ },
"workspaces-web": {
"description": "C++ SDK for the AWS workspaces-web service"
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
