From 82cd615f7c61faee13569145abd9cb6c7d6662ab Mon Sep 17 00:00:00 2001 From: Isaiah Norton Date: Tue, 5 Dec 2023 23:42:18 -0500 Subject: [PATCH] Revert "Update the AWS SDK to version 1.11.160. (#4214)" This reverts commit c524631cc64c1d4f5788cd38ba639ba746eb8674. --- cmake/Modules/FindAWSSDK_EP.cmake | 37 +- .../inputs/patches/ep_awssdk/awsccommon.patch | 13 + .../ep_awssdk/awsconfig_cmake_3.22.patch | 23 + .../patches/ep_awssdk/disable-werror.patch | 14 + ports/aws-c-auth/portfile.cmake | 32 - ports/aws-c-auth/vcpkg.json | 25 - ports/aws-c-cal/fix-cmake-target-path.patch | 28 + ports/aws-c-cal/portfile.cmake | 31 +- .../aws-c-cal/remove-libcrypto-messages.patch | 24 +- ports/aws-c-cal/vcpkg.json | 4 +- .../disable-internal-crt-option.patch | 16 +- .../aws-c-common/fix-cmake-target-path.patch | 28 + ports/aws-c-common/portfile.cmake | 25 +- ports/aws-c-common/vcpkg.json | 3 +- ports/aws-c-compression/portfile.cmake | 32 - ports/aws-c-compression/vcpkg.json | 19 - .../fix-cmake-target-path.patch | 28 + ports/aws-c-event-stream/portfile.cmake | 24 +- ports/aws-c-event-stream/vcpkg.json | 5 +- ports/aws-c-http/portfile.cmake | 32 - ports/aws-c-http/vcpkg.json | 22 - ports/aws-c-io/fix-cmake-target-path.patch | 27 + ports/aws-c-io/portfile.cmake | 24 +- ports/aws-c-io/vcpkg.json | 3 +- ports/aws-c-mqtt/portfile.cmake | 32 - ports/aws-c-mqtt/vcpkg.json | 24 - ports/aws-c-s3/portfile.cmake | 32 - ports/aws-c-s3/vcpkg.json | 26 - ports/aws-c-sdkutils/portfile.cmake | 32 - ports/aws-c-sdkutils/vcpkg.json | 19 - .../aws-checksums/fix-cmake-target-path.patch | 25 + ports/aws-checksums/portfile.cmake | 22 +- ports/aws-checksums/vcpkg.json | 4 +- ports/aws-crt-cpp/no-werror.patch | 15 - ports/aws-crt-cpp/portfile.cmake | 38 - ports/aws-crt-cpp/vcpkg.json | 32 - .../001-patch-relocatable-rpath.patch | 12 + ports/aws-sdk-cpp/002-aws-c-common.patch | 13 + ...-root.patch => 003-fix-AWSSDKCONFIG.patch} | 33 +- .../004-fix-check-c-source-runs.patch | 16 + ports/aws-sdk-cpp/005-fix-cjson-sprintf.patch | 59 + .../006-pjd-fix-compiler-warnings.patch | 39 + .../007-lock-curl-http-and-tls-settings.patch | 24 + ports/aws-sdk-cpp/008-disable-werror.patch | 14 + ports/aws-sdk-cpp/CONTROL | 539 ++++++++ ports/aws-sdk-cpp/CONTROL.in | 6 + ports/aws-sdk-cpp/compute_build_only.cmake | 564 +------- ports/aws-sdk-cpp/generateFeatures.ps1 | 76 +- .../lock-curl-http-and-tls-settings.patch | 20 - .../aws-sdk-cpp/patch-relocatable-rpath.patch | 12 - ports/aws-sdk-cpp/portfile.cmake | 80 +- ports/aws-sdk-cpp/usage | 9 +- ports/aws-sdk-cpp/vcpkg.in.json | 37 - ports/aws-sdk-cpp/vcpkg.json | 1186 ----------------- tiledb/CMakeLists.txt | 30 +- vcpkg.json | 2 +- 56 files changed, 1120 insertions(+), 2471 deletions(-) create mode 100644 cmake/inputs/patches/ep_awssdk/awsccommon.patch create mode 100644 cmake/inputs/patches/ep_awssdk/awsconfig_cmake_3.22.patch create mode 100644 cmake/inputs/patches/ep_awssdk/disable-werror.patch delete mode 100644 ports/aws-c-auth/portfile.cmake delete mode 100644 ports/aws-c-auth/vcpkg.json create mode 100644 ports/aws-c-cal/fix-cmake-target-path.patch create mode 100644 ports/aws-c-common/fix-cmake-target-path.patch delete mode 100644 ports/aws-c-compression/portfile.cmake delete mode 100644 ports/aws-c-compression/vcpkg.json create mode 100644 ports/aws-c-event-stream/fix-cmake-target-path.patch delete mode 100644 ports/aws-c-http/portfile.cmake delete mode 100644 ports/aws-c-http/vcpkg.json create mode 100644 ports/aws-c-io/fix-cmake-target-path.patch delete mode 100644 ports/aws-c-mqtt/portfile.cmake delete mode 100644 ports/aws-c-mqtt/vcpkg.json delete mode 100644 ports/aws-c-s3/portfile.cmake delete mode 100644 ports/aws-c-s3/vcpkg.json delete mode 100644 ports/aws-c-sdkutils/portfile.cmake delete mode 100644 ports/aws-c-sdkutils/vcpkg.json create mode 100644 ports/aws-checksums/fix-cmake-target-path.patch delete mode 100644 ports/aws-crt-cpp/no-werror.patch delete mode 100644 ports/aws-crt-cpp/portfile.cmake delete mode 100644 ports/aws-crt-cpp/vcpkg.json create mode 100644 ports/aws-sdk-cpp/001-patch-relocatable-rpath.patch create mode 100644 ports/aws-sdk-cpp/002-aws-c-common.patch rename ports/aws-sdk-cpp/{fix-aws-root.patch => 003-fix-AWSSDKCONFIG.patch} (53%) create mode 100644 ports/aws-sdk-cpp/004-fix-check-c-source-runs.patch create mode 100644 ports/aws-sdk-cpp/005-fix-cjson-sprintf.patch create mode 100644 ports/aws-sdk-cpp/006-pjd-fix-compiler-warnings.patch create mode 100644 ports/aws-sdk-cpp/007-lock-curl-http-and-tls-settings.patch create mode 100644 ports/aws-sdk-cpp/008-disable-werror.patch create mode 100644 ports/aws-sdk-cpp/CONTROL create mode 100644 ports/aws-sdk-cpp/CONTROL.in delete mode 100644 ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch delete mode 100644 ports/aws-sdk-cpp/patch-relocatable-rpath.patch delete mode 100644 ports/aws-sdk-cpp/vcpkg.in.json delete mode 100644 ports/aws-sdk-cpp/vcpkg.json diff --git a/cmake/Modules/FindAWSSDK_EP.cmake b/cmake/Modules/FindAWSSDK_EP.cmake index 514ae5898d7..6482d548751 100644 --- a/cmake/Modules/FindAWSSDK_EP.cmake +++ b/cmake/Modules/FindAWSSDK_EP.cmake @@ -42,12 +42,17 @@ if(TILEDB_VCPKG) if (TILEDB_STATIC) + # not included for unknown reasons + list(APPEND AWSSDK_THIRD_PARTY_LIBS aws-c-io aws-c-cal) + set(AWSSDK_EXTRA_LIBS) - # Since AWS SDK 1.11, AWSSDK_THIRD_PARTY_LIBS was replaced by AWSSDK_COMMON_RUNTIME_LIBS. - foreach(TARGET IN LISTS AWSSDK_THIRD_PARTY_LIBS AWSSDK_COMMON_RUNTIME_LIBS) - if (TARGET AWS::${TARGET}) - list(APPEND AWSSDK_EXTRA_LIBS "AWS::${TARGET}") - endif() + foreach(TARGET IN LISTS AWSSDK_THIRD_PARTY_LIBS) + message(STATUS "Try finding ${TARGET}") + find_package(${TARGET} NO_DEFAULT_PATH) + message(STATUS "Found ${TARGET}: ${${TARGET}_FOUND}") + if (${TARGET}_FOUND) + list(APPEND AWSSDK_EXTRA_LIBS "AWS::${TARGET}") + endif() endforeach() install_all_target_libs("${AWSSDK_EXTRA_LIBS}") endif() @@ -106,10 +111,10 @@ if (NOT AWSSDK_FOUND) message(STATUS "Adding AWSSDK as an external project") set(DEPENDS) - if (NOT WIN32 AND TARGET ep_curl) + if (TARGET ep_curl) list(APPEND DEPENDS ep_curl) endif() - if (NOT WIN32 AND TARGET ep_openssl) + if (TARGET ep_openssl) list(APPEND DEPENDS ep_openssl) endif() if (TARGET ep_zlib) @@ -138,6 +143,16 @@ if (NOT AWSSDK_FOUND) set(CMAKE_GENERATOR_PLATFORM "") endif() + if (WIN32) + find_package(Git REQUIRED) + set(CONDITIONAL_PATCH cd ${CMAKE_SOURCE_DIR} && ${GIT_EXECUTABLE} apply --ignore-whitespace -p1 --unsafe-paths --verbose --directory=${TILEDB_EP_SOURCE_DIR}/ep_awssdk < ${TILEDB_CMAKE_INPUTS_DIR}/patches/ep_awssdk/awsccommon.patch && + ${GIT_EXECUTABLE} apply --ignore-whitespace -p1 --unsafe-paths --verbose --directory=${TILEDB_EP_SOURCE_DIR}/ep_awssdk < ${TILEDB_CMAKE_INPUTS_DIR}/patches/ep_awssdk/awsconfig_cmake_3.22.patch && + ${GIT_EXECUTABLE} apply --ignore-whitespace -p1 --unsafe-paths --verbose --directory=${TILEDB_EP_SOURCE_DIR}/ep_awssdk < ${TILEDB_CMAKE_INPUTS_DIR}/patches/ep_awssdk/disable-werror.patch) + else() + set(CONDITIONAL_PATCH patch -N -p1 < ${TILEDB_CMAKE_INPUTS_DIR}/patches/ep_awssdk/awsccommon.patch && + patch -N -p1 < ${TILEDB_CMAKE_INPUTS_DIR}/patches/ep_awssdk/awsconfig_cmake_3.22.patch && + patch -N -p1 < ${TILEDB_CMAKE_INPUTS_DIR}/patches/ep_awssdk/disable-werror.patch) + endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR NOT WIN32) set(CONDITIONAL_CXX_FLAGS "-DCMAKE_CXX_FLAGS=-Wno-nonnull -Wno-error=deprecated-declarations") endif() @@ -146,13 +161,13 @@ if (NOT AWSSDK_FOUND) PREFIX "externals" # Set download name to avoid collisions with only the version number in the filename DOWNLOAD_NAME ep_awssdk.zip - # We download with git clone because the repository has submodules - GIT_REPOSITORY "https://github.com/aws/aws-sdk-cpp.git" - GIT_TAG "1.11.160" + URL "https://github.com/aws/aws-sdk-cpp/archive/1.8.84.zip" + URL_HASH SHA1=e32a53a01c75ca7fdfe9feed9c5bbcedd98708e3 + PATCH_COMMAND + ${CONDITIONAL_PATCH} CMAKE_ARGS -DCMAKE_BUILD_TYPE=${AWS_CMAKE_BUILD_TYPE} -DENABLE_TESTING=OFF - -DAWS_SDK_WARNINGS_ARE_ERRORS=OFF -DBUILD_ONLY=s3\\$core\\$identity-management\\$sts -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_BINDIR=lib diff --git a/cmake/inputs/patches/ep_awssdk/awsccommon.patch b/cmake/inputs/patches/ep_awssdk/awsccommon.patch new file mode 100644 index 00000000000..0690361b3b6 --- /dev/null +++ b/cmake/inputs/patches/ep_awssdk/awsccommon.patch @@ -0,0 +1,13 @@ +diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt +index b4cf1be2..64f10d43 100644 +--- a/third-party/CMakeLists.txt ++++ b/third-party/CMakeLists.txt +@@ -15,7 +15,7 @@ set(AWS_DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies buil + set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies download directory.") + + set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git") +-set(AWS_C_COMMON_TAG "v0.4.42") ++set(AWS_C_COMMON_TAG "v0.6.2") + include(BuildAwsCCommon) + + set(AWS_CHECKSUMS_URL "https://github.com/awslabs/aws-checksums.git") diff --git a/cmake/inputs/patches/ep_awssdk/awsconfig_cmake_3.22.patch b/cmake/inputs/patches/ep_awssdk/awsconfig_cmake_3.22.patch new file mode 100644 index 00000000000..9a7d6c4dfe0 --- /dev/null +++ b/cmake/inputs/patches/ep_awssdk/awsconfig_cmake_3.22.patch @@ -0,0 +1,23 @@ +diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake +index 83eac0b3b4..c1bf32066d 100644 +--- a/cmake/AWSSDKConfig.cmake ++++ b/cmake/AWSSDKConfig.cmake +@@ -129,11 +129,13 @@ endif() + get_filename_component(TEMP_PATH "${AWSSDK_CORE_LIB_FILE}" PATH) + get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) + +-while (NOT TEMP_NAME STREQUAL ${LIB_SEARCH_PREFIX}) +- set(TEMP_PLATFORM_PREFIX "${TEMP_NAME}/${TEMP_PLATFORM_PREFIX}") +- get_filename_component(TEMP_PATH "${TEMP_PATH}" PATH) +- get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) +-endwhile() ++if(LIB_SEARCH_PREFIX) ++ while (NOT TEMP_NAME STREQUAL "${LIB_SEARCH_PREFIX}") ++ set(TEMP_PLATFORM_PREFIX "${TEMP_NAME}/${TEMP_PLATFORM_PREFIX}") ++ get_filename_component(TEMP_PATH "${TEMP_PATH}" PATH) ++ get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) ++ endwhile() ++endif() + + set(AWSSDK_PLATFORM_PREFIX "${TEMP_PLATFORM_PREFIX}") + diff --git a/cmake/inputs/patches/ep_awssdk/disable-werror.patch b/cmake/inputs/patches/ep_awssdk/disable-werror.patch new file mode 100644 index 00000000000..9733fe6adaf --- /dev/null +++ b/cmake/inputs/patches/ep_awssdk/disable-werror.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index c92652cc5..e2fa5e27a 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -53,7 +53,7 @@ macro(set_gcc_flags) + endmacro() + + macro(set_gcc_warnings) +- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") ++ list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra") + if(COMPILER_CLANG) + if(PLATFORM_ANDROID) + # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. + diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake deleted file mode 100644 index be658b76ac7..00000000000 --- a/ports/aws-c-auth/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-auth - REF "v${VERSION}" - SHA512 a5508c7bee8a8b4fb12d598e270913d3b6e63190faa866c98d841cc5df814f959cda88e62ea794b7456f23c07a8457f7d4af78ac4758211791051293843ba3b5 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json deleted file mode 100644 index 9bf2280e88a..00000000000 --- a/ports/aws-c-auth/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "aws-c-auth", - "version": "0.7.3", - "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", - "homepage": "https://github.com/awslabs/aws-c-auth", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-cal", - "aws-c-http", - "aws-c-sdkutils", - { - "name": "s2n", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-cal/fix-cmake-target-path.patch b/ports/aws-c-cal/fix-cmake-target-path.patch new file mode 100644 index 00000000000..25d6749b873 --- /dev/null +++ b/ports/aws-c-cal/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6039819..b74b65c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-cal-config.cmake b/cmake/aws-c-cal-config.cmake +index 73e7311..e87c43a 100644 +--- a/cmake/aws-c-cal-config.cmake ++++ b/cmake/aws-c-cal-config.cmake +@@ -7,9 +7,5 @@ if (NOT BYO_CRYPTO AND NOT WIN32 AND NOT APPLE) + find_dependency(LibCrypto) + endif() + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake index 4782cce5420..e9c8e4f7e24 100644 --- a/ports/aws-c-cal/portfile.cmake +++ b/ports/aws-c-cal/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-cal - REF "v${VERSION}" - SHA512 b1116977b467c2c7f10f84912a3bc2a8329e3ec22c58f19f7b8a244a2b08fb3420bed62791b7ad6f06b8aeff6c361a33ddc0ac28cf781dfa1aafc83a62aa24ec + REF c4c5b175e05f2affe5e3f0203ca6c8bc5cdd8f51 # v0.5.12 + SHA512 25dd1d7f207f1324aed418555dda1c3d4ec64baf76431c9efd88fd3c34b163a2e5a6778192d2c0caf937f3efd31b2f21e6a0d0f7230684d176164da0e8bcc92e HEAD_REF master - PATCHES remove-libcrypto-messages.patch + PATCHES fix-cmake-target-path.patch + remove-libcrypto-messages.patch ) vcpkg_cmake_configure( @@ -16,18 +17,24 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-cal/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-cal" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-cal" + ) vcpkg_copy_pdbs() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-cal/remove-libcrypto-messages.patch b/ports/aws-c-cal/remove-libcrypto-messages.patch index 5a1d5dc35d0..6115bb1d336 100644 --- a/ports/aws-c-cal/remove-libcrypto-messages.patch +++ b/ports/aws-c-cal/remove-libcrypto-messages.patch @@ -1,14 +1,14 @@ -diff --git a/cmake/modules/Findcrypto.cmake b/cmake/modules/Findcrypto.cmake -index fed83bb..9c1ae28 100644 ---- a/cmake/modules/Findcrypto.cmake -+++ b/cmake/modules/Findcrypto.cmake -@@ -105,9 +105,6 @@ else() - set(CRYPTO_FOUND true) - set(crypto_FOUND true) +diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake +index 564ba97..f748212 100644 +--- a/cmake/modules/FindLibCrypto.cmake ++++ b/cmake/modules/FindLibCrypto.cmake +@@ -89,9 +89,6 @@ else() + set(LIBCRYPTO_FOUND true) + set(LibCrypto_FOUND true) -- message(STATUS "LibCrypto Include Dir: ${crypto_INCLUDE_DIR}") -- message(STATUS "LibCrypto Shared Lib: ${crypto_SHARED_LIBRARY}") -- message(STATUS "LibCrypto Static Lib: ${crypto_STATIC_LIBRARY}") - if (NOT TARGET AWS::crypto AND - (EXISTS "${crypto_LIBRARY}") +- message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") +- message(STATUS "LibCrypto Shared Lib: ${LibCrypto_SHARED_LIBRARY}") +- message(STATUS "LibCrypto Static Lib: ${LibCrypto_STATIC_LIBRARY}") + if (NOT TARGET crypto AND + (EXISTS "${LibCrypto_LIBRARY}") ) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json index ff6212c8abd..94b2f10728a 100644 --- a/ports/aws-c-cal/vcpkg.json +++ b/ports/aws-c-cal/vcpkg.json @@ -1,9 +1,9 @@ { "name": "aws-c-cal", - "version": "0.6.2", + "version": "0.5.12", + "port-version": 2, "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", - "license": "Apache-2.0", "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch index 1a0fabd4f2b..6fec4b214d1 100644 --- a/ports/aws-c-common/disable-internal-crt-option.patch +++ b/ports/aws-c-common/disable-internal-crt-option.patch @@ -1,19 +1,19 @@ diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake -index 470f6db..537536b 100644 +index 249b7d5..41a31e2 100644 --- a/cmake/AwsCFlags.cmake +++ b/cmake/AwsCFlags.cmake -@@ -82,15 +82,6 @@ function(aws_set_common_properties target) +@@ -38,15 +38,6 @@ function(aws_set_common_properties target) list(APPEND AWS_C_FLAGS /DAWS_SUPPORT_WIN7=1) endif() -- # Set MSVC runtime libary. -- # Note: there are other ways of doing this if we bump our CMake minimum to 3.14+ -- # See: https://cmake.org/cmake/help/latest/policy/CMP0091.html -- if (AWS_STATIC_MSVC_RUNTIME_LIBRARY OR STATIC_CRT) -- list(APPEND AWS_C_FLAGS "/MT$<$:d>") +- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE) +- if(STATIC_CRT) +- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") - else() -- list(APPEND AWS_C_FLAGS "/MD$<$:d>") +- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") - endif() +- string(REPLACE " " ";" _FLAGS "${_FLAGS}") +- list(APPEND AWS_C_FLAGS "${_FLAGS}") - else() list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes) diff --git a/ports/aws-c-common/fix-cmake-target-path.patch b/ports/aws-c-common/fix-cmake-target-path.patch new file mode 100644 index 00000000000..9ab97f6798d --- /dev/null +++ b/ports/aws-c-common/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b01f56..3cc541d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -239,7 +239,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake +index e495210..b7676c2 100644 +--- a/cmake/aws-c-common-config.cmake ++++ b/cmake/aws-c-common-config.cmake +@@ -4,9 +4,5 @@ if(WIN32 OR UNIX OR APPLE) + find_package(Threads REQUIRED) + endif() + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 0d00bf2473f..d8672c140f9 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common - REF "v${VERSION}" - SHA512 e68f7096bb5a0f908e28f910d51366284713c477ed3ea852136d4f33ad940bcb66a8fe731ba0b1f6e397812f07be426b982c62ea0e3ead0e581f46d3e5801c13 + REF 68f28f8df258390744f3c5b460250f8809161041 # v0.6.20 + SHA512 a8be405e0e1586a06db038a0068df2c9277772ff7b8df2c542d18d2aae4b2bc0fd89de668ab10d84476446834390e4e27383b68d86c7d9f0d0749b57802866f1 HEAD_REF master PATCHES disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow + fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time ) vcpkg_cmake_configure( @@ -16,20 +17,18 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) # central macros -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-common/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-common" + ) vcpkg_copy_pdbs() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index fab95ef4f03..736f8127248 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,9 +1,8 @@ { "name": "aws-c-common", - "version": "0.9.3", + "version": "0.6.20", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", - "license": "Apache-2.0", "supports": "!(windows & arm) & !uwp", "dependencies": [ { diff --git a/ports/aws-c-compression/portfile.cmake b/ports/aws-c-compression/portfile.cmake deleted file mode 100644 index 3104c34f4b1..00000000000 --- a/ports/aws-c-compression/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-compression - REF "v${VERSION}" - SHA512 7813ae3d19336a187dd218d22748a09b397aea68f344e44ce0472490babdd7c7a4bb94d586a38d7f0c7d3b6f29502ec9ccf080b020e15fd24891ec1b3cdb4663 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json deleted file mode 100644 index 351ad87cea1..00000000000 --- a/ports/aws-c-compression/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "aws-c-compression", - "version": "0.2.17", - "description": "C99 implementation of huffman encoding/decoding", - "homepage": "https://github.com/awslabs/aws-c-compression", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-common", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-event-stream/fix-cmake-target-path.patch b/ports/aws-c-event-stream/fix-cmake-target-path.patch new file mode 100644 index 00000000000..37d28ca9bc5 --- /dev/null +++ b/ports/aws-c-event-stream/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index daf434c..32d7851 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,7 +91,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake +index 76adb84..7884368 100644 +--- a/cmake/aws-c-event-stream-config.cmake ++++ b/cmake/aws-c-event-stream-config.cmake +@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro) + find_dependency(aws-c-io) + find_dependency(aws-checksums) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake index e725a88532b..be821d66bd2 100644 --- a/ports/aws-c-event-stream/portfile.cmake +++ b/ports/aws-c-event-stream/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-event-stream - REF "v${VERSION}" - SHA512 295ee4b1f647f5b15790e000cd5f0102e64ef03912c1c7378739f52229b82090384c66367c4caf8fa7f34f3275b3da71bc031cf6000053ad31d53ce075721da2 + REF e87537be561d753ec82e783bc0929b1979c585f8 # v0.2.7 + SHA512 651b05ba6d87ad8f65f6cf7e8940b7ea500722848f3e65c2de0bf84d2e6321d0aa1631d4f64a78cf5ed5ed5adac6805a4e91e5c31b3ae86e8c37afb38da4c786 HEAD_REF master + PATCHES fix-cmake-target-path.patch ) vcpkg_cmake_configure( @@ -15,18 +16,17 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-event-stream/cmake) file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-event-stream" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream" + ) vcpkg_copy_pdbs() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json index 1c3135a5ed5..ebabcab6a4d 100644 --- a/ports/aws-c-event-stream/vcpkg.json +++ b/ports/aws-c-event-stream/vcpkg.json @@ -1,11 +1,12 @@ { "name": "aws-c-event-stream", - "version": "0.3.2", + "version": "0.2.7", + "port-version": 2, "description": "C99 implementation of the vnd.amazon.event-stream content-type.", "homepage": "https://github.com/awslabs/aws-c-event-stream", - "license": "Apache-2.0", "supports": "!(windows & arm) & !uwp", "dependencies": [ + "aws-c-cal", "aws-c-common", "aws-c-io", "aws-checksums", diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake deleted file mode 100644 index abda1ef1786..00000000000 --- a/ports/aws-c-http/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-http - REF "v${VERSION}" - SHA512 451b542926e5eeb85006053ba8835636d6fbb33ff31ecacb0b3e98d667b9768cdb448c172a33cfe400171fff64c37492ec4467da443d99ae32a70292de6d1713 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json deleted file mode 100644 index 852afc214c5..00000000000 --- a/ports/aws-c-http/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "aws-c-http", - "version": "0.7.12", - "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", - "homepage": "https://github.com/awslabs/aws-c-http", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-cal", - "aws-c-common", - "aws-c-compression", - "aws-c-io", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-io/fix-cmake-target-path.patch b/ports/aws-c-io/fix-cmake-target-path.patch new file mode 100644 index 00000000000..ca5d575e443 --- /dev/null +++ b/ports/aws-c-io/fix-cmake-target-path.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8a9099..a657782 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-io-config.cmake b/cmake/aws-c-io-config.cmake +index d4bc525..72a78ec 100644 +--- a/cmake/aws-c-io-config.cmake ++++ b/cmake/aws-c-io-config.cmake +@@ -7,8 +7,4 @@ endif() + find_dependency(aws-c-common) + find_dependency(aws-c-cal) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index 96bbd929172..d72cdaed69a 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io - REF "v${VERSION}" - SHA512 54f6ef23ab7fb65c9d1425d21d59daf1b13a50595f7f06c7d4f74bfb5941a7ddf0185ae3249b940473422c1880bb034c0610876c6e13ae499ccd2dcc888c1b23 + REF cfe553a770e9c2d1c93b8cdfb870b9f2a46b436e # v0.10.22 + SHA512 7a741f5b1c895ceb11f73b67828fd3623c180cb8a3863f3b63a67ac1437d2c47911d50510777b13ee66fd0a009ab09a8c83fd036a0fca2f25a0835f48f023de7 HEAD_REF master + PATCHES fix-cmake-target-path.patch ) vcpkg_cmake_configure( @@ -15,18 +16,17 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-io/cmake) file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-io" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-io" + ) vcpkg_copy_pdbs() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index f7720445def..203f3649fd7 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,9 +1,8 @@ { "name": "aws-c-io", - "version": "0.13.32", + "version": "0.10.22", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", - "license": "Apache-2.0", "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake deleted file mode 100644 index 7fbc122c28f..00000000000 --- a/ports/aws-c-mqtt/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-mqtt - REF "v${VERSION}" - SHA512 e5b7adf0e4450d93159f996e1e95bcc09b97985b180fa4f13f1f9a1f8901e9e287248f2b7af552e3d2742d29c257ad6f4975458824833054b06794c4f916af96 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json deleted file mode 100644 index 1c7eb94bca6..00000000000 --- a/ports/aws-c-mqtt/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "aws-c-mqtt", - "version": "0.9.5", - "description": "C99 implementation of the MQTT 3.1.1 specification.", - "homepage": "https://github.com/awslabs/aws-c-mqtt", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-http", - "aws-c-io", - { - "name": "s2n", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake deleted file mode 100644 index 5453b8e8d6b..00000000000 --- a/ports/aws-c-s3/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-s3 - REF "v${VERSION}" - SHA512 f96cab50c0f96d6cb3cb8e142cc95c91e9efd0b02d115e91ec5d2fc7c4be350d58342f5846065216a49c080aaf3954fa9732ff423bad20b250afe4227ee3aaef - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json deleted file mode 100644 index 0616b5d83a5..00000000000 --- a/ports/aws-c-s3/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "aws-c-s3", - "version": "0.3.17", - "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", - "homepage": "https://github.com/awslabs/aws-c-s3", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-auth", - "aws-c-http", - "aws-c-sdkutils", - "aws-checksums", - { - "name": "s2n", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-c-sdkutils/portfile.cmake b/ports/aws-c-sdkutils/portfile.cmake deleted file mode 100644 index 53ed5fdc8a0..00000000000 --- a/ports/aws-c-sdkutils/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-c-sdkutils - REF "v${VERSION}" - SHA512 34d5bc5190fc6890533247d304b791625f59b0f60aca972b03e00f684b37dd3b806b7c371f1f8b048a30cb9960326d1534c53874621c9630215e597ba8700685 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-c-sdkutils/vcpkg.json b/ports/aws-c-sdkutils/vcpkg.json deleted file mode 100644 index bb91dda4e0d..00000000000 --- a/ports/aws-c-sdkutils/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "aws-c-sdkutils", - "version": "0.1.12", - "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...", - "homepage": "https://github.com/awslabs/aws-c-sdkutils", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-common", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-checksums/fix-cmake-target-path.patch b/ports/aws-checksums/fix-cmake-target-path.patch new file mode 100644 index 00000000000..101a5379f28 --- /dev/null +++ b/ports/aws-checksums/fix-cmake-target-path.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 888742b..efdd817 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,7 +140,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake +index 6de2e44..84d55d1 100644 +--- a/cmake/aws-checksums-config.cmake ++++ b/cmake/aws-checksums-config.cmake +@@ -1,6 +1,2 @@ +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake index 07234e6ca53..55f05f78471 100644 --- a/ports/aws-checksums/portfile.cmake +++ b/ports/aws-checksums/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-checksums - REF "v${VERSION}" - SHA512 b75f5442db9a61f8856756c4a784339fd446effca0cdb02c67e51ce9f14ea76f5ca94d29a69f2a452c63c868598489343ec1d097432a8a0159868731422cfbf4 + REF 99bb0ad4b89d335d638536694352c45e0d2188f5 # v0.1.11 + SHA512 cb9c249496fd41fda1efb9330e823d8b965adca6c8f372a50fe97eda821e277780bf9af8f5977102c44121568993cca55edbb750967b41f323e07e06a93c50a8 HEAD_REF master + PATCHES fix-cmake-target-path.patch ) if (VCPKG_CRT_LINKAGE STREQUAL static) @@ -22,18 +23,17 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-checksums/cmake) file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-checksums" + "${CURRENT_PACKAGES_DIR}/lib/aws-checksums" ) vcpkg_copy_pdbs() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json index c915c21576c..c31742e6a88 100644 --- a/ports/aws-checksums/vcpkg.json +++ b/ports/aws-checksums/vcpkg.json @@ -1,9 +1,9 @@ { "name": "aws-checksums", - "version": "0.1.17", + "version": "0.1.11", + "port-version": 3, "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-checksums", - "license": "Apache-2.0", "supports": "!(windows & arm)", "dependencies": [ "aws-c-common", diff --git a/ports/aws-crt-cpp/no-werror.patch b/ports/aws-crt-cpp/no-werror.patch deleted file mode 100644 index 27b7c8f8ab6..00000000000 --- a/ports/aws-crt-cpp/no-werror.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision f2adef31d778cfe90b8a5bb377425f825ebf92f0) -+++ b/CMakeLists.txt (date 1675009099302) -@@ -337,9 +337,9 @@ - # set extra warning flags - if(AWS_WARNINGS_ARE_ERRORS) - if(MSVC) -- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /wd4068) -+ target_compile_options(${PROJECT_NAME} PRIVATE /W4 /wd4068) - else() -- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror) -+ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic) - endif() - endif() - diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake deleted file mode 100644 index 2addfc63ae6..00000000000 --- a/ports/aws-crt-cpp/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO awslabs/aws-crt-cpp - REF "v${VERSION}" - SHA512 88631845bf78e526b3160d0ba6ff67922b09f8e25864bfeeb4cf16f2d217bf00c9686e53e70382129d8209612453190024a16aa3cff153198960c8895f2e1772 - PATCHES - no-werror.patch -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - "-DSTATIC_CRT=${STATIC_CRT}" - -DBUILD_DEPS=OFF - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - -DBUILD_TESTING=FALSE -) - -vcpkg_cmake_install() - -string(REPLACE "dynamic" "shared" subdir "${VCPKG_LIBRARY_LINKAGE}") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake/${subdir}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/${PORT}/cmake") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" [[/${type}/]] "/") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/${PORT}" -) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json deleted file mode 100644 index 6a5f6e4128c..00000000000 --- a/ports/aws-crt-cpp/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "aws-crt-cpp", - "version": "0.23.1", - "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", - "homepage": "https://github.com/awslabs/aws-crt-cpp", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-c-auth", - "aws-c-cal", - "aws-c-common", - "aws-c-compression", - "aws-c-event-stream", - "aws-c-http", - "aws-c-io", - "aws-c-mqtt", - "aws-c-s3", - "aws-checksums", - { - "name": "s2n", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aws-sdk-cpp/001-patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/001-patch-relocatable-rpath.patch new file mode 100644 index 00000000000..9c5a5a2c5d0 --- /dev/null +++ b/ports/aws-sdk-cpp/001-patch-relocatable-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a653e38628..76d6067646 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 third-party targets + if (BUILD_DEPS) diff --git a/ports/aws-sdk-cpp/002-aws-c-common.patch b/ports/aws-sdk-cpp/002-aws-c-common.patch new file mode 100644 index 00000000000..0690361b3b6 --- /dev/null +++ b/ports/aws-sdk-cpp/002-aws-c-common.patch @@ -0,0 +1,13 @@ +diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt +index b4cf1be2..64f10d43 100644 +--- a/third-party/CMakeLists.txt ++++ b/third-party/CMakeLists.txt +@@ -15,7 +15,7 @@ set(AWS_DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies buil + set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies download directory.") + + set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git") +-set(AWS_C_COMMON_TAG "v0.4.42") ++set(AWS_C_COMMON_TAG "v0.6.2") + include(BuildAwsCCommon) + + set(AWS_CHECKSUMS_URL "https://github.com/awslabs/aws-checksums.git") diff --git a/ports/aws-sdk-cpp/fix-aws-root.patch b/ports/aws-sdk-cpp/003-fix-AWSSDKCONFIG.patch similarity index 53% rename from ports/aws-sdk-cpp/fix-aws-root.patch rename to ports/aws-sdk-cpp/003-fix-AWSSDKCONFIG.patch index da4365ad721..421286de2e4 100644 --- a/ports/aws-sdk-cpp/fix-aws-root.patch +++ b/ports/aws-sdk-cpp/003-fix-AWSSDKCONFIG.patch @@ -1,22 +1,33 @@ diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake ---- a/cmake/AWSSDKConfig.cmake (revision 2f90f9fd6c56460bd382243aa215fcddcb5883c8) -+++ b/cmake/AWSSDKConfig.cmake (date 1636913220527) -@@ -54,18 +54,14 @@ - string(REPLACE ";" "${AWS_MODULE_DIR};" SYSTEM_MODULE_PATH "${CMAKE_SYSTEM_PREFIX_PATH}${AWS_MODULE_DIR}") - list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH} ${SYSTEM_MODULE_PATH}) +index c2f643e..4fb4a2f 100644 +--- a/cmake/AWSSDKConfig.cmake ++++ b/cmake/AWSSDKConfig.cmake +@@ -24,6 +24,12 @@ if(AWSSDK_FOUND) + return() + endif() + ++include(CMakeFindDependencyMacro) ++if (NOT WIN32) ++find_dependency(OpenSSL) ++endif() ++find_dependency(ZLIB) ++ + include(${CMAKE_CURRENT_LIST_DIR}/AWSSDKConfigVersion.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/sdksCommon.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/platformDeps.cmake) +@@ -43,7 +49,6 @@ endif() --# On Windows, dlls are treated as runtime target and installed in bindir + # On Windows, dlls are treated as runtime target and installed in bindir if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS) - set(AWSSDK_INSTALL_LIBDIR "${AWSSDK_INSTALL_BINDIR}") # If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers add_definitions(-DUSE_IMPORT_EXPORT) endif() - - - # Compute the default installation root relative to this file. --# from prefix/lib/cmake/AWSSDK/xx.cmake to prefix +@@ -54,7 +59,6 @@ endif() get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE) + + set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.") diff --git a/ports/aws-sdk-cpp/004-fix-check-c-source-runs.patch b/ports/aws-sdk-cpp/004-fix-check-c-source-runs.patch new file mode 100644 index 00000000000..c782d56f407 --- /dev/null +++ b/ports/aws-sdk-cpp/004-fix-check-c-source-runs.patch @@ -0,0 +1,16 @@ +diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt +index fa9f99326b..3cb60a9171 100644 +--- a/aws-cpp-sdk-core/CMakeLists.txt ++++ b/aws-cpp-sdk-core/CMakeLists.txt +@@ -89,9 +89,10 @@ include(CheckCXXSourceRuns) + + # http client implementations + if(ENABLE_CURL_CLIENT) ++ find_package(ZLIB REQUIRED) + file(GLOB HTTP_CURL_CLIENT_HEADERS "include/aws/core/http/curl/*.h") + file(GLOB HTTP_CURL_CLIENT_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/http/curl/*.cpp") +- set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES}) ++ set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES} ZLIB::ZLIB) + check_c_source_runs(" + #include + int main() { diff --git a/ports/aws-sdk-cpp/005-fix-cjson-sprintf.patch b/ports/aws-sdk-cpp/005-fix-cjson-sprintf.patch new file mode 100644 index 00000000000..0cc6df3d074 --- /dev/null +++ b/ports/aws-sdk-cpp/005-fix-cjson-sprintf.patch @@ -0,0 +1,59 @@ +diff --git a/aws-cpp-sdk-core/source/external/cjson/cJSON.cpp b/aws-cpp-sdk-core/source/external/cjson/cJSON.cpp +index 2525976334..cf18a8391a 100644 +--- a/aws-cpp-sdk-core/source/external/cjson/cJSON.cpp ++++ b/aws-cpp-sdk-core/source/external/cjson/cJSON.cpp +@@ -88,7 +88,7 @@ CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item) { + CJSON_PUBLIC(const char*) cJSON_Version(void) + { + static char version[15]; +- sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH); ++ snprintf(version, 15, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH); + + return version; + } +@@ -500,23 +500,23 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out + /* For integer which is out of the range of [INT_MIN, INT_MAX], valuestring is an integer literal. */ + if (item->valuestring) + { +- length = sprintf((char*)number_buffer, "%s", item->valuestring); ++ length = snprintf((char*)number_buffer, 26, "%s", item->valuestring); + } + /* This checks for NaN and Infinity */ + else if ((d * 0) != 0) + { +- length = sprintf((char*)number_buffer, "null"); ++ length = snprintf((char*)number_buffer, 26, "null"); + } + else + { + /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */ +- length = sprintf((char*)number_buffer, "%1.15g", d); ++ length = snprintf((char*)number_buffer, 26, "%1.15g", d); + + /* Check whether the original double can be recovered */ + if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || ((double)test != d)) + { + /* If not, print with 17 decimal places of precision */ +- length = sprintf((char*)number_buffer, "%1.17g", d); ++ length = snprintf((char*)number_buffer, 26, "%1.17g", d); + } + } + +@@ -949,7 +949,7 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe + break; + default: + /* escape and print as unicode codepoint */ +- sprintf((char*)output_pointer, "u%04x", *input_pointer); ++ snprintf((char*)output_pointer, 6, "u%04x", *input_pointer); + output_pointer += 4; + break; + } +@@ -2342,7 +2342,7 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateInt64(long long num) + if (num > INT_MAX || num < INT_MIN) + { + char buf[21]; +- sprintf(buf, "%lld", num); ++ snprintf(buf, 21, "%lld", num); + item->valuestring = (char*)cJSON_strdup((const unsigned char*)buf, &global_hooks); + } + diff --git a/ports/aws-sdk-cpp/006-pjd-fix-compiler-warnings.patch b/ports/aws-sdk-cpp/006-pjd-fix-compiler-warnings.patch new file mode 100644 index 00000000000..117485cd864 --- /dev/null +++ b/ports/aws-sdk-cpp/006-pjd-fix-compiler-warnings.patch @@ -0,0 +1,39 @@ +diff --git a/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp b/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp +index 5e6c8fc379..5d46008aef 100644 +--- a/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp ++++ b/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp +@@ -362,7 +362,7 @@ void SetOptCodeForHttpMethod(CURL* requestHandle, const std::shared_ptrGetInternalError()) << ", " +- "ErrorMessage: " << handler->GetEventPayloadAsString()); ++ AWS_LOGSTREAM_ERROR(EVENT_STREAM_DECODER_CLASS_TAG, "Payload received, but handler is null."); + return; + } + handler->WriteMessageEventPayload(static_cast(payload->buffer), payload->len); +@@ -129,9 +127,7 @@ namespace Aws + assert(handler); + if (!handler) + { +- AWS_LOGSTREAM_ERROR(EVENT_STREAM_DECODER_CLASS_TAG, "Payload received, but decoder encountered internal errors before." +- "ErrorCode: " << EventStreamErrorsMapper::GetNameForError(handler->GetInternalError()) << ", " +- "ErrorMessage: " << handler->GetEventPayloadAsString()); ++ AWS_LOGSTREAM_ERROR(EVENT_STREAM_DECODER_CLASS_TAG, "Header received, but handler is null."); + return; + } + diff --git a/ports/aws-sdk-cpp/007-lock-curl-http-and-tls-settings.patch b/ports/aws-sdk-cpp/007-lock-curl-http-and-tls-settings.patch new file mode 100644 index 00000000000..a53b3676837 --- /dev/null +++ b/ports/aws-sdk-cpp/007-lock-curl-http-and-tls-settings.patch @@ -0,0 +1,24 @@ +diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt +index 3cb60a9171..860b184633 100644 +--- a/aws-cpp-sdk-core/CMakeLists.txt ++++ b/aws-cpp-sdk-core/CMakeLists.txt +@@ -93,17 +93,8 @@ if(ENABLE_CURL_CLIENT) + file(GLOB HTTP_CURL_CLIENT_HEADERS "include/aws/core/http/curl/*.h") + file(GLOB HTTP_CURL_CLIENT_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/http/curl/*.cpp") + set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES} ZLIB::ZLIB) +- check_c_source_runs(" +- #include +- int main() { +- CURL* handle = curl_easy_init(); +- return curl_easy_setopt(handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0); }" CURL_HAS_H2) +- check_c_source_runs(" +- #include +- int main() { +- CURL* handle = curl_easy_init(); +- return curl_easy_setopt(handle, CURLOPT_PROXY_SSLCERT, \"client.pem\"); }" CURL_HAS_TLS_PROXY) +- unset(CMAKE_REQUIRED_LIBRARIES) ++ set(CURL_HAS_H2 OFF) ++ set(CURL_HAS_TLS_PROXY ON) + elseif(ENABLE_WINDOWS_CLIENT) + # NOTE: HTTP/2 is not supported when using IXML_HTTP_REQUEST_2 + if(USE_IXML_HTTP_REQUEST_2) diff --git a/ports/aws-sdk-cpp/008-disable-werror.patch b/ports/aws-sdk-cpp/008-disable-werror.patch new file mode 100644 index 00000000000..9733fe6adaf --- /dev/null +++ b/ports/aws-sdk-cpp/008-disable-werror.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index c92652cc5..e2fa5e27a 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -53,7 +53,7 @@ macro(set_gcc_flags) + endmacro() + + macro(set_gcc_warnings) +- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") ++ list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra") + if(COMPILER_CLANG) + if(PLATFORM_ANDROID) + # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. + diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL new file mode 100644 index 00000000000..7ce44016085 --- /dev/null +++ b/ports/aws-sdk-cpp/CONTROL @@ -0,0 +1,539 @@ +Source: aws-sdk-cpp +Version: 1.8.84 +Port-Version: 0 +Homepage: https://github.com/aws/aws-sdk-cpp +Description: AWS SDK for C++ +Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream, zlib +Default-Features: dynamodb, s3, kinesis +# Automatically generated by generateFeatures.ps1 + +Feature: access-management +Description: C++ SDK for the AWS access-management service + +Feature: acm +Description: C++ SDK for the AWS acm service + +Feature: acm-pca +Description: C++ SDK for the AWS acm-pca service + +Feature: alexaforbusiness +Description: C++ SDK for the AWS alexaforbusiness service + +Feature: amplify +Description: C++ SDK for the AWS amplify service + +Feature: apigateway +Description: C++ SDK for the AWS apigateway service + +Feature: apigatewaymanagementapi +Description: C++ SDK for the AWS apigatewaymanagementapi service + +Feature: apigatewayv2 +Description: C++ SDK for the AWS apigatewayv2 service + +Feature: application-autoscaling +Description: C++ SDK for the AWS application-autoscaling service + +Feature: appmesh +Description: C++ SDK for the AWS appmesh service + +Feature: appstream +Description: C++ SDK for the AWS appstream service + +Feature: appsync +Description: C++ SDK for the AWS appsync service + +Feature: athena +Description: C++ SDK for the AWS athena service + +Feature: autoscaling +Description: C++ SDK for the AWS autoscaling service + +Feature: autoscaling-plans +Description: C++ SDK for the AWS autoscaling-plans service + +Feature: awsmigrationhub +Description: C++ SDK for the AWS AWSMigrationHub service + +Feature: awstransfer +Description: C++ SDK for the AWS awstransfer service + +Feature: backup +Description: C++ SDK for the AWS backup service + +Feature: batch +Description: C++ SDK for the AWS batch service + +Feature: budgets +Description: C++ SDK for the AWS budgets service + +Feature: ce +Description: C++ SDK for the AWS ce service + +Feature: chime +Description: C++ SDK for the AWS chime service + +Feature: cloud9 +Description: C++ SDK for the AWS cloud9 service + +Feature: clouddirectory +Description: C++ SDK for the AWS clouddirectory service + +Feature: cloudformation +Description: C++ SDK for the AWS cloudformation service + +Feature: cloudfront +Description: C++ SDK for the AWS cloudfront service + +Feature: cloudhsm +Description: C++ SDK for the AWS cloudhsm service + +Feature: cloudhsmv2 +Description: C++ SDK for the AWS cloudhsmv2 service + +Feature: cloudsearch +Description: C++ SDK for the AWS cloudsearch service + +Feature: cloudsearchdomain +Description: C++ SDK for the AWS cloudsearchdomain service + +Feature: cloudtrail +Description: C++ SDK for the AWS cloudtrail service + +Feature: codebuild +Description: C++ SDK for the AWS codebuild service + +Feature: codecommit +Description: C++ SDK for the AWS codecommit service + +Feature: codedeploy +Description: C++ SDK for the AWS codedeploy service + +Feature: codepipeline +Description: C++ SDK for the AWS codepipeline service + +Feature: codestar +Description: C++ SDK for the AWS codestar service + +Feature: cognito-identity +Description: C++ SDK for the AWS cognito-identity service + +Feature: cognito-idp +Description: C++ SDK for the AWS cognito-idp service + +Feature: cognito-sync +Description: C++ SDK for the AWS cognito-sync service + +Feature: comprehend +Description: C++ SDK for the AWS comprehend service + +Feature: comprehendmedical +Description: C++ SDK for the AWS comprehendmedical service + +Feature: config +Description: C++ SDK for the AWS config service + +Feature: connect +Description: C++ SDK for the AWS connect service + +Feature: cur +Description: C++ SDK for the AWS cur service + +Feature: datapipeline +Description: C++ SDK for the AWS datapipeline service + +Feature: datasync +Description: C++ SDK for the AWS datasync service + +Feature: dax +Description: C++ SDK for the AWS dax service + +Feature: devicefarm +Description: C++ SDK for the AWS devicefarm service + +Feature: directconnect +Description: C++ SDK for the AWS directconnect service + +Feature: discovery +Description: C++ SDK for the AWS discovery service + +Feature: dlm +Description: C++ SDK for the AWS dlm service + +Feature: dms +Description: C++ SDK for the AWS dms service + +Feature: docdb +Description: C++ SDK for the AWS docdb service + +Feature: ds +Description: C++ SDK for the AWS ds service + +Feature: dynamodb +Description: C++ SDK for the AWS dynamodb service + +Feature: dynamodbstreams +Description: C++ SDK for the AWS dynamodbstreams service + +Feature: ec2 +Description: C++ SDK for the AWS ec2 service + +Feature: ecr +Description: C++ SDK for the AWS ecr service + +Feature: ecs +Description: C++ SDK for the AWS ecs service + +Feature: eks +Description: C++ SDK for the AWS eks service + +Feature: elasticache +Description: C++ SDK for the AWS elasticache service + +Feature: elasticbeanstalk +Description: C++ SDK for the AWS elasticbeanstalk service + +Feature: elasticfilesystem +Description: C++ SDK for the AWS elasticfilesystem service + +Feature: elasticloadbalancing +Description: C++ SDK for the AWS elasticloadbalancing service + +Feature: elasticloadbalancingv2 +Description: C++ SDK for the AWS elasticloadbalancingv2 service + +Feature: elasticmapreduce +Description: C++ SDK for the AWS elasticmapreduce service + +Feature: elastictranscoder +Description: C++ SDK for the AWS elastictranscoder service + +Feature: email +Description: C++ SDK for the AWS email service + +Feature: es +Description: C++ SDK for the AWS es service + +Feature: events +Description: C++ SDK for the AWS events service + +Feature: firehose +Description: C++ SDK for the AWS firehose service + +Feature: fms +Description: C++ SDK for the AWS fms service + +Feature: fsx +Description: C++ SDK for the AWS fsx service + +Feature: gamelift +Description: C++ SDK for the AWS gamelift service + +Feature: glacier +Description: C++ SDK for the AWS glacier service + +Feature: globalaccelerator +Description: C++ SDK for the AWS globalaccelerator service + +Feature: glue +Description: C++ SDK for the AWS glue service + +Feature: greengrass +Description: C++ SDK for the AWS greengrass service + +Feature: guardduty +Description: C++ SDK for the AWS guardduty service + +Feature: health +Description: C++ SDK for the AWS health service + +Feature: iam +Description: C++ SDK for the AWS iam service + +Feature: identity-management +Description: C++ SDK for the AWS identity-management service + +Feature: importexport +Description: C++ SDK for the AWS importexport service + +Feature: inspector +Description: C++ SDK for the AWS inspector service + +Feature: iot +Description: C++ SDK for the AWS iot service + +Feature: iot-data +Description: C++ SDK for the AWS iot-data service + +Feature: iot-jobs-data +Description: C++ SDK for the AWS iot-jobs-data service + +Feature: iot1click-devices +Description: C++ SDK for the AWS iot1click-devices service + +Feature: iot1click-projects +Description: C++ SDK for the AWS iot1click-projects service + +Feature: iotanalytics +Description: C++ SDK for the AWS iotanalytics service + +Feature: kafka +Description: C++ SDK for the AWS kafka service + +Feature: kinesis +Description: C++ SDK for the AWS kinesis service + +Feature: kinesis-video-archived-media +Description: C++ SDK for the AWS kinesis-video-archived-media service + +Feature: kinesis-video-media +Description: C++ SDK for the AWS kinesis-video-media service + +Feature: kinesisanalytics +Description: C++ SDK for the AWS kinesisanalytics service + +Feature: kinesisanalyticsv2 +Description: C++ SDK for the AWS kinesisanalyticsv2 service + +Feature: kinesisvideo +Description: C++ SDK for the AWS kinesisvideo service + +Feature: kms +Description: C++ SDK for the AWS kms service + +Feature: lambda +Description: C++ SDK for the AWS lambda service + +Feature: lex +Description: C++ SDK for the AWS lex service + +Feature: lex-models +Description: C++ SDK for the AWS lex-models service + +Feature: license-manager +Description: C++ SDK for the AWS license-manager service + +Feature: lightsail +Description: C++ SDK for the AWS lightsail service + +Feature: logs +Description: C++ SDK for the AWS logs service + +Feature: machinelearning +Description: C++ SDK for the AWS machinelearning service + +Feature: macie +Description: C++ SDK for the AWS macie service + +Feature: marketplace-entitlement +Description: C++ SDK for the AWS marketplace-entitlement service + +Feature: marketplacecommerceanalytics +Description: C++ SDK for the AWS marketplacecommerceanalytics service + +Feature: mediaconnect +Description: C++ SDK for the AWS mediaconnect service + +Feature: mediaconvert +Description: C++ SDK for the AWS mediaconvert service + +Feature: medialive +Description: C++ SDK for the AWS medialive service + +Feature: mediapackage +Description: C++ SDK for the AWS mediapackage service + +Feature: mediastore +Description: C++ SDK for the AWS mediastore service + +Feature: mediastore-data +Description: C++ SDK for the AWS mediastore-data service + +Feature: mediatailor +Description: C++ SDK for the AWS mediatailor service + +Feature: meteringmarketplace +Description: C++ SDK for the AWS meteringmarketplace service + +Feature: mobile +Description: C++ SDK for the AWS mobile service + +Feature: mobileanalytics +Description: C++ SDK for the AWS mobileanalytics service + +Feature: monitoring +Description: C++ SDK for the AWS monitoring service + +Feature: mq +Description: C++ SDK for the AWS mq service + +Feature: mturk-requester +Description: C++ SDK for the AWS mturk-requester service + +Feature: neptune +Description: C++ SDK for the AWS neptune service + +Feature: opsworks +Description: C++ SDK for the AWS opsworks service + +Feature: opsworkscm +Description: C++ SDK for the AWS opsworkscm service + +Feature: organizations +Description: C++ SDK for the AWS organizations service + +Feature: pi +Description: C++ SDK for the AWS pi service + +Feature: pinpoint +Description: C++ SDK for the AWS pinpoint service + +Feature: pinpoint-email +Description: C++ SDK for the AWS pinpoint-email service + +Feature: polly +Description: C++ SDK for the AWS polly service + +Feature: pricing +Description: C++ SDK for the AWS pricing service + +Feature: queues +Description: C++ SDK for the AWS queues service + +Feature: quicksight +Description: C++ SDK for the AWS quicksight service + +Feature: ram +Description: C++ SDK for the AWS ram service + +Feature: rds +Description: C++ SDK for the AWS rds service + +Feature: rds-data +Description: C++ SDK for the AWS rds-data service + +Feature: redshift +Description: C++ SDK for the AWS redshift service + +Feature: rekognition +Description: C++ SDK for the AWS rekognition service + +Feature: resource-groups +Description: C++ SDK for the AWS resource-groups service + +Feature: resourcegroupstaggingapi +Description: C++ SDK for the AWS resourcegroupstaggingapi service + +Feature: robomaker +Description: C++ SDK for the AWS robomaker service + +Feature: route53 +Description: C++ SDK for the AWS route53 service + +Feature: route53domains +Description: C++ SDK for the AWS route53domains service + +Feature: route53resolver +Description: C++ SDK for the AWS route53resolver service + +Feature: s3 +Description: C++ SDK for the AWS s3 service + +Feature: s3-encryption +Description: C++ SDK for the AWS s3-encryption service + +Feature: s3control +Description: C++ SDK for the AWS s3control service + +Feature: sagemaker +Description: C++ SDK for the AWS sagemaker service + +Feature: sagemaker-runtime +Description: C++ SDK for the AWS sagemaker-runtime service + +Feature: sdb +Description: C++ SDK for the AWS sdb service + +Feature: secretsmanager +Description: C++ SDK for the AWS secretsmanager service + +Feature: securityhub +Description: C++ SDK for the AWS securityhub service + +Feature: serverlessrepo +Description: C++ SDK for the AWS serverlessrepo service + +Feature: servicecatalog +Description: C++ SDK for the AWS servicecatalog service + +Feature: servicediscovery +Description: C++ SDK for the AWS servicediscovery service + +Feature: shield +Description: C++ SDK for the AWS shield service + +Feature: signer +Description: C++ SDK for the AWS signer service + +Feature: sms +Description: C++ SDK for the AWS sms service + +Feature: sms-voice +Description: C++ SDK for the AWS sms-voice service + +Feature: snowball +Description: C++ SDK for the AWS snowball service + +Feature: sns +Description: C++ SDK for the AWS sns service + +Feature: sqs +Description: C++ SDK for the AWS sqs service + +Feature: ssm +Description: C++ SDK for the AWS ssm service + +Feature: states +Description: C++ SDK for the AWS states service + +Feature: storagegateway +Description: C++ SDK for the AWS storagegateway service + +Feature: sts +Description: C++ SDK for the AWS sts service + +Feature: support +Description: C++ SDK for the AWS support service + +Feature: swf +Description: C++ SDK for the AWS swf service + +Feature: text-to-speech +Description: C++ SDK for the AWS text-to-speech service + +Feature: transcribe +Description: C++ SDK for the AWS transcribe service + +Feature: transfer +Description: C++ SDK for the AWS transfer service + +Feature: translate +Description: C++ SDK for the AWS translate service + +Feature: waf +Description: C++ SDK for the AWS waf service + +Feature: waf-regional +Description: C++ SDK for the AWS waf-regional service + +Feature: workdocs +Description: C++ SDK for the AWS workdocs service + +Feature: workmail +Description: C++ SDK for the AWS workmail service + +Feature: workspaces +Description: C++ SDK for the AWS workspaces service + +Feature: xray +Description: C++ SDK for the AWS xray service diff --git a/ports/aws-sdk-cpp/CONTROL.in b/ports/aws-sdk-cpp/CONTROL.in new file mode 100644 index 00000000000..eae9ddb73c1 --- /dev/null +++ b/ports/aws-sdk-cpp/CONTROL.in @@ -0,0 +1,6 @@ +Source: aws-sdk-cpp +Version: 1.8.84 +Port-Version: 0 +Description: AWS SDK for C++ +Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream +Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake index 27b93c24bc7..ba9bcb26d59 100644 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ b/ports/aws-sdk-cpp/compute_build_only.cmake @@ -2,12 +2,6 @@ if("access-management" IN_LIST FEATURES) list(APPEND BUILD_ONLY access-management) endif() -if("accessanalyzer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY accessanalyzer) -endif() -if("account" IN_LIST FEATURES) - list(APPEND BUILD_ONLY account) -endif() if("acm" IN_LIST FEATURES) list(APPEND BUILD_ONLY acm) endif() @@ -17,18 +11,9 @@ endif() if("alexaforbusiness" IN_LIST FEATURES) list(APPEND BUILD_ONLY alexaforbusiness) endif() -if("amp" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amp) -endif() if("amplify" IN_LIST FEATURES) list(APPEND BUILD_ONLY amplify) endif() -if("amplifybackend" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplifybackend) -endif() -if("amplifyuibuilder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplifyuibuilder) -endif() if("apigateway" IN_LIST FEATURES) list(APPEND BUILD_ONLY apigateway) endif() @@ -38,51 +23,21 @@ endif() if("apigatewayv2" IN_LIST FEATURES) list(APPEND BUILD_ONLY apigatewayv2) endif() -if("appconfig" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appconfig) -endif() -if("appconfigdata" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appconfigdata) -endif() -if("appfabric" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appfabric) -endif() -if("appflow" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appflow) -endif() -if("appintegrations" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appintegrations) -endif() if("application-autoscaling" IN_LIST FEATURES) list(APPEND BUILD_ONLY application-autoscaling) endif() -if("application-insights" IN_LIST FEATURES) - list(APPEND BUILD_ONLY application-insights) -endif() -if("applicationcostprofiler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY applicationcostprofiler) -endif() if("appmesh" IN_LIST FEATURES) list(APPEND BUILD_ONLY appmesh) endif() -if("apprunner" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apprunner) -endif() if("appstream" IN_LIST FEATURES) list(APPEND BUILD_ONLY appstream) endif() if("appsync" IN_LIST FEATURES) list(APPEND BUILD_ONLY appsync) endif() -if("arc-zonal-shift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY arc-zonal-shift) -endif() if("athena" IN_LIST FEATURES) list(APPEND BUILD_ONLY athena) endif() -if("auditmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY auditmanager) -endif() if("autoscaling" IN_LIST FEATURES) list(APPEND BUILD_ONLY autoscaling) endif() @@ -98,21 +53,9 @@ endif() if("backup" IN_LIST FEATURES) list(APPEND BUILD_ONLY backup) endif() -if("backup-gateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backup-gateway) -endif() -if("backupstorage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backupstorage) -endif() if("batch" IN_LIST FEATURES) list(APPEND BUILD_ONLY batch) endif() -if("billingconductor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY billingconductor) -endif() -if("braket" IN_LIST FEATURES) - list(APPEND BUILD_ONLY braket) -endif() if("budgets" IN_LIST FEATURES) list(APPEND BUILD_ONLY budgets) endif() @@ -122,30 +65,9 @@ endif() if("chime" IN_LIST FEATURES) list(APPEND BUILD_ONLY chime) endif() -if("chime-sdk-identity" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-identity) -endif() -if("chime-sdk-media-pipelines" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-media-pipelines) -endif() -if("chime-sdk-meetings" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-meetings) -endif() -if("chime-sdk-messaging" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-messaging) -endif() -if("chime-sdk-voice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-voice) -endif() -if("cleanrooms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cleanrooms) -endif() if("cloud9" IN_LIST FEATURES) list(APPEND BUILD_ONLY cloud9) endif() -if("cloudcontrol" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudcontrol) -endif() if("clouddirectory" IN_LIST FEATURES) list(APPEND BUILD_ONLY clouddirectory) endif() @@ -170,45 +92,21 @@ endif() if("cloudtrail" IN_LIST FEATURES) list(APPEND BUILD_ONLY cloudtrail) endif() -if("cloudtrail-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudtrail-data) -endif() -if("codeartifact" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeartifact) -endif() if("codebuild" IN_LIST FEATURES) list(APPEND BUILD_ONLY codebuild) endif() -if("codecatalyst" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codecatalyst) -endif() if("codecommit" IN_LIST FEATURES) list(APPEND BUILD_ONLY codecommit) endif() if("codedeploy" IN_LIST FEATURES) list(APPEND BUILD_ONLY codedeploy) endif() -if("codeguru-reviewer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguru-reviewer) -endif() -if("codeguru-security" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguru-security) -endif() -if("codeguruprofiler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguruprofiler) -endif() if("codepipeline" IN_LIST FEATURES) list(APPEND BUILD_ONLY codepipeline) endif() if("codestar" IN_LIST FEATURES) list(APPEND BUILD_ONLY codestar) endif() -if("codestar-connections" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar-connections) -endif() -if("codestar-notifications" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar-notifications) -endif() if("cognito-identity" IN_LIST FEATURES) list(APPEND BUILD_ONLY cognito-identity) endif() @@ -224,42 +122,15 @@ endif() if("comprehendmedical" IN_LIST FEATURES) list(APPEND BUILD_ONLY comprehendmedical) endif() -if("compute-optimizer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY compute-optimizer) -endif() if("config" IN_LIST FEATURES) list(APPEND BUILD_ONLY config) endif() if("connect" IN_LIST FEATURES) list(APPEND BUILD_ONLY connect) endif() -if("connect-contact-lens" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connect-contact-lens) -endif() -if("connectcampaigns" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectcampaigns) -endif() -if("connectcases" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectcases) -endif() -if("connectparticipant" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectparticipant) -endif() -if("controltower" IN_LIST FEATURES) - list(APPEND BUILD_ONLY controltower) -endif() if("cur" IN_LIST FEATURES) list(APPEND BUILD_ONLY cur) endif() -if("customer-profiles" IN_LIST FEATURES) - list(APPEND BUILD_ONLY customer-profiles) -endif() -if("databrew" IN_LIST FEATURES) - list(APPEND BUILD_ONLY databrew) -endif() -if("dataexchange" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dataexchange) -endif() if("datapipeline" IN_LIST FEATURES) list(APPEND BUILD_ONLY datapipeline) endif() @@ -269,15 +140,9 @@ endif() if("dax" IN_LIST FEATURES) list(APPEND BUILD_ONLY dax) endif() -if("detective" IN_LIST FEATURES) - list(APPEND BUILD_ONLY detective) -endif() if("devicefarm" IN_LIST FEATURES) list(APPEND BUILD_ONLY devicefarm) endif() -if("devops-guru" IN_LIST FEATURES) - list(APPEND BUILD_ONLY devops-guru) -endif() if("directconnect" IN_LIST FEATURES) list(APPEND BUILD_ONLY directconnect) endif() @@ -293,12 +158,6 @@ endif() if("docdb" IN_LIST FEATURES) list(APPEND BUILD_ONLY docdb) endif() -if("docdb-elastic" IN_LIST FEATURES) - list(APPEND BUILD_ONLY docdb-elastic) -endif() -if("drs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY drs) -endif() if("ds" IN_LIST FEATURES) list(APPEND BUILD_ONLY ds) endif() @@ -308,30 +167,18 @@ endif() if("dynamodbstreams" IN_LIST FEATURES) list(APPEND BUILD_ONLY dynamodbstreams) endif() -if("ebs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ebs) -endif() if("ec2" IN_LIST FEATURES) list(APPEND BUILD_ONLY ec2) endif() -if("ec2-instance-connect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ec2-instance-connect) -endif() if("ecr" IN_LIST FEATURES) list(APPEND BUILD_ONLY ecr) endif() -if("ecr-public" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecr-public) -endif() if("ecs" IN_LIST FEATURES) list(APPEND BUILD_ONLY ecs) endif() if("eks" IN_LIST FEATURES) list(APPEND BUILD_ONLY eks) endif() -if("elastic-inference" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elastic-inference) -endif() if("elasticache" IN_LIST FEATURES) list(APPEND BUILD_ONLY elasticache) endif() @@ -356,60 +203,24 @@ endif() if("email" IN_LIST FEATURES) list(APPEND BUILD_ONLY email) endif() -if("emr-containers" IN_LIST FEATURES) - list(APPEND BUILD_ONLY emr-containers) -endif() -if("emr-serverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY emr-serverless) -endif() -if("entityresolution" IN_LIST FEATURES) - list(APPEND BUILD_ONLY entityresolution) -endif() if("es" IN_LIST FEATURES) list(APPEND BUILD_ONLY es) endif() -if("eventbridge" IN_LIST FEATURES) - list(APPEND BUILD_ONLY eventbridge) -endif() if("events" IN_LIST FEATURES) list(APPEND BUILD_ONLY events) endif() -if("evidently" IN_LIST FEATURES) - list(APPEND BUILD_ONLY evidently) -endif() -if("finspace" IN_LIST FEATURES) - list(APPEND BUILD_ONLY finspace) -endif() -if("finspace-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY finspace-data) -endif() if("firehose" IN_LIST FEATURES) list(APPEND BUILD_ONLY firehose) endif() -if("fis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY fis) -endif() if("fms" IN_LIST FEATURES) list(APPEND BUILD_ONLY fms) endif() -if("forecast" IN_LIST FEATURES) - list(APPEND BUILD_ONLY forecast) -endif() -if("forecastquery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY forecastquery) -endif() -if("frauddetector" IN_LIST FEATURES) - list(APPEND BUILD_ONLY frauddetector) -endif() if("fsx" IN_LIST FEATURES) list(APPEND BUILD_ONLY fsx) endif() if("gamelift" IN_LIST FEATURES) list(APPEND BUILD_ONLY gamelift) endif() -if("gamesparks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY gamesparks) -endif() if("glacier" IN_LIST FEATURES) list(APPEND BUILD_ONLY glacier) endif() @@ -419,54 +230,27 @@ endif() if("glue" IN_LIST FEATURES) list(APPEND BUILD_ONLY glue) endif() -if("grafana" IN_LIST FEATURES) - list(APPEND BUILD_ONLY grafana) -endif() if("greengrass" IN_LIST FEATURES) list(APPEND BUILD_ONLY greengrass) endif() -if("greengrassv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY greengrassv2) -endif() -if("groundstation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY groundstation) -endif() if("guardduty" IN_LIST FEATURES) list(APPEND BUILD_ONLY guardduty) endif() if("health" IN_LIST FEATURES) list(APPEND BUILD_ONLY health) endif() -if("healthlake" IN_LIST FEATURES) - list(APPEND BUILD_ONLY healthlake) -endif() -if("honeycode" IN_LIST FEATURES) - list(APPEND BUILD_ONLY honeycode) -endif() if("iam" IN_LIST FEATURES) list(APPEND BUILD_ONLY iam) endif() if("identity-management" IN_LIST FEATURES) list(APPEND BUILD_ONLY identity-management) endif() -if("identitystore" IN_LIST FEATURES) - list(APPEND BUILD_ONLY identitystore) -endif() -if("imagebuilder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY imagebuilder) -endif() if("importexport" IN_LIST FEATURES) list(APPEND BUILD_ONLY importexport) endif() if("inspector" IN_LIST FEATURES) list(APPEND BUILD_ONLY inspector) endif() -if("inspector2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY inspector2) -endif() -if("internetmonitor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY internetmonitor) -endif() if("iot" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot) endif() @@ -476,9 +260,6 @@ endif() if("iot-jobs-data" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot-jobs-data) endif() -if("iot-roborunner" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-roborunner) -endif() if("iot1click-devices" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot1click-devices) endif() @@ -488,60 +269,9 @@ endif() if("iotanalytics" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotanalytics) endif() -if("iotdeviceadvisor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotdeviceadvisor) -endif() -if("iotevents" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotevents) -endif() -if("iotevents-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotevents-data) -endif() -if("iotfleethub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotfleethub) -endif() -if("iotfleetwise" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotfleetwise) -endif() -if("iotsecuretunneling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotsecuretunneling) -endif() -if("iotsitewise" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotsitewise) -endif() -if("iotthingsgraph" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotthingsgraph) -endif() -if("iottwinmaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iottwinmaker) -endif() -if("iotwireless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotwireless) -endif() -if("ivs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivs) -endif() -if("ivs-realtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivs-realtime) -endif() -if("ivschat" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivschat) -endif() if("kafka" IN_LIST FEATURES) list(APPEND BUILD_ONLY kafka) endif() -if("kafkaconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kafkaconnect) -endif() -if("kendra" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kendra) -endif() -if("kendra-ranking" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kendra-ranking) -endif() -if("keyspaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY keyspaces) -endif() if("kinesis" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesis) endif() @@ -551,12 +281,6 @@ endif() if("kinesis-video-media" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesis-video-media) endif() -if("kinesis-video-signaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-signaling) -endif() -if("kinesis-video-webrtc-storage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-webrtc-storage) -endif() if("kinesisanalytics" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesisanalytics) endif() @@ -569,9 +293,6 @@ endif() if("kms" IN_LIST FEATURES) list(APPEND BUILD_ONLY kms) endif() -if("lakeformation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lakeformation) -endif() if("lambda" IN_LIST FEATURES) list(APPEND BUILD_ONLY lambda) endif() @@ -581,60 +302,21 @@ endif() if("lex-models" IN_LIST FEATURES) list(APPEND BUILD_ONLY lex-models) endif() -if("lexv2-models" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lexv2-models) -endif() -if("lexv2-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lexv2-runtime) -endif() if("license-manager" IN_LIST FEATURES) list(APPEND BUILD_ONLY license-manager) endif() -if("license-manager-linux-subscriptions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager-linux-subscriptions) -endif() -if("license-manager-user-subscriptions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager-user-subscriptions) -endif() if("lightsail" IN_LIST FEATURES) list(APPEND BUILD_ONLY lightsail) endif() -if("location" IN_LIST FEATURES) - list(APPEND BUILD_ONLY location) -endif() if("logs" IN_LIST FEATURES) list(APPEND BUILD_ONLY logs) endif() -if("lookoutequipment" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutequipment) -endif() -if("lookoutmetrics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutmetrics) -endif() -if("lookoutvision" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutvision) -endif() -if("m2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY m2) -endif() if("machinelearning" IN_LIST FEATURES) list(APPEND BUILD_ONLY machinelearning) endif() if("macie" IN_LIST FEATURES) list(APPEND BUILD_ONLY macie) endif() -if("macie2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY macie2) -endif() -if("managedblockchain" IN_LIST FEATURES) - list(APPEND BUILD_ONLY managedblockchain) -endif() -if("managedblockchain-query" IN_LIST FEATURES) - list(APPEND BUILD_ONLY managedblockchain-query) -endif() -if("marketplace-catalog" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplace-catalog) -endif() if("marketplace-entitlement" IN_LIST FEATURES) list(APPEND BUILD_ONLY marketplace-entitlement) endif() @@ -653,12 +335,6 @@ endif() if("mediapackage" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediapackage) endif() -if("mediapackage-vod" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackage-vod) -endif() -if("mediapackagev2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackagev2) -endif() if("mediastore" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediastore) endif() @@ -668,33 +344,15 @@ endif() if("mediatailor" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediatailor) endif() -if("medical-imaging" IN_LIST FEATURES) - list(APPEND BUILD_ONLY medical-imaging) -endif() -if("memorydb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY memorydb) -endif() if("meteringmarketplace" IN_LIST FEATURES) list(APPEND BUILD_ONLY meteringmarketplace) endif() -if("mgn" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mgn) -endif() -if("migration-hub-refactor-spaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migration-hub-refactor-spaces) -endif() -if("migrationhub-config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhub-config) -endif() -if("migrationhuborchestrator" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhuborchestrator) -endif() -if("migrationhubstrategy" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhubstrategy) -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() @@ -704,36 +362,9 @@ endif() if("mturk-requester" IN_LIST FEATURES) list(APPEND BUILD_ONLY mturk-requester) endif() -if("mwaa" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mwaa) -endif() if("neptune" IN_LIST FEATURES) list(APPEND BUILD_ONLY neptune) endif() -if("neptunedata" IN_LIST FEATURES) - list(APPEND BUILD_ONLY neptunedata) -endif() -if("network-firewall" IN_LIST FEATURES) - list(APPEND BUILD_ONLY network-firewall) -endif() -if("networkmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY networkmanager) -endif() -if("nimble" IN_LIST FEATURES) - list(APPEND BUILD_ONLY nimble) -endif() -if("oam" IN_LIST FEATURES) - list(APPEND BUILD_ONLY oam) -endif() -if("omics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY omics) -endif() -if("opensearch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opensearch) -endif() -if("opensearchserverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opensearchserverless) -endif() if("opsworks" IN_LIST FEATURES) list(APPEND BUILD_ONLY opsworks) endif() @@ -743,33 +374,6 @@ endif() if("organizations" IN_LIST FEATURES) list(APPEND BUILD_ONLY organizations) endif() -if("osis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY osis) -endif() -if("outposts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY outposts) -endif() -if("panorama" IN_LIST FEATURES) - list(APPEND BUILD_ONLY panorama) -endif() -if("payment-cryptography" IN_LIST FEATURES) - list(APPEND BUILD_ONLY payment-cryptography) -endif() -if("payment-cryptography-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY payment-cryptography-data) -endif() -if("pca-connector-ad" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pca-connector-ad) -endif() -if("personalize" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize) -endif() -if("personalize-events" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize-events) -endif() -if("personalize-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize-runtime) -endif() if("pi" IN_LIST FEATURES) list(APPEND BUILD_ONLY pi) endif() @@ -779,30 +383,12 @@ endif() if("pinpoint-email" IN_LIST FEATURES) list(APPEND BUILD_ONLY pinpoint-email) endif() -if("pinpoint-sms-voice-v2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint-sms-voice-v2) -endif() -if("pipes" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pipes) -endif() if("polly" IN_LIST FEATURES) list(APPEND BUILD_ONLY polly) endif() if("pricing" IN_LIST FEATURES) list(APPEND BUILD_ONLY pricing) endif() -if("privatenetworks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY privatenetworks) -endif() -if("proton" IN_LIST FEATURES) - list(APPEND BUILD_ONLY proton) -endif() -if("qldb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY qldb) -endif() -if("qldb-session" IN_LIST FEATURES) - list(APPEND BUILD_ONLY qldb-session) -endif() if("queues" IN_LIST FEATURES) list(APPEND BUILD_ONLY queues) endif() @@ -812,9 +398,6 @@ endif() if("ram" IN_LIST FEATURES) list(APPEND BUILD_ONLY ram) endif() -if("rbin" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rbin) -endif() if("rds" IN_LIST FEATURES) list(APPEND BUILD_ONLY rds) endif() @@ -824,21 +407,9 @@ endif() if("redshift" IN_LIST FEATURES) list(APPEND BUILD_ONLY redshift) endif() -if("redshift-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift-data) -endif() -if("redshift-serverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift-serverless) -endif() if("rekognition" IN_LIST FEATURES) list(APPEND BUILD_ONLY rekognition) endif() -if("resiliencehub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resiliencehub) -endif() -if("resource-explorer-2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resource-explorer-2) -endif() if("resource-groups" IN_LIST FEATURES) list(APPEND BUILD_ONLY resource-groups) endif() @@ -848,75 +419,30 @@ endif() if("robomaker" IN_LIST FEATURES) list(APPEND BUILD_ONLY robomaker) endif() -if("rolesanywhere" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rolesanywhere) -endif() if("route53" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53) endif() -if("route53-recovery-cluster" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-cluster) -endif() -if("route53-recovery-control-config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-control-config) -endif() -if("route53-recovery-readiness" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-readiness) -endif() if("route53domains" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53domains) endif() if("route53resolver" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53resolver) endif() -if("rum" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rum) -endif() if("s3" IN_LIST FEATURES) list(APPEND BUILD_ONLY s3) endif() -if("s3-crt" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3-crt) -endif() if("s3-encryption" IN_LIST FEATURES) list(APPEND BUILD_ONLY s3-encryption) endif() if("s3control" IN_LIST FEATURES) list(APPEND BUILD_ONLY s3control) endif() -if("s3outposts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3outposts) -endif() if("sagemaker" IN_LIST FEATURES) list(APPEND BUILD_ONLY sagemaker) endif() -if("sagemaker-a2i-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-a2i-runtime) -endif() -if("sagemaker-edge" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-edge) -endif() -if("sagemaker-featurestore-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-featurestore-runtime) -endif() -if("sagemaker-geospatial" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-geospatial) -endif() -if("sagemaker-metrics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-metrics) -endif() if("sagemaker-runtime" IN_LIST FEATURES) list(APPEND BUILD_ONLY sagemaker-runtime) endif() -if("savingsplans" IN_LIST FEATURES) - list(APPEND BUILD_ONLY savingsplans) -endif() -if("scheduler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY scheduler) -endif() -if("schemas" IN_LIST FEATURES) - list(APPEND BUILD_ONLY schemas) -endif() if("sdb" IN_LIST FEATURES) list(APPEND BUILD_ONLY sdb) endif() @@ -926,45 +452,27 @@ endif() if("securityhub" IN_LIST FEATURES) list(APPEND BUILD_ONLY securityhub) endif() -if("securitylake" IN_LIST FEATURES) - list(APPEND BUILD_ONLY securitylake) -endif() if("serverlessrepo" IN_LIST FEATURES) list(APPEND BUILD_ONLY serverlessrepo) endif() -if("service-quotas" IN_LIST FEATURES) - list(APPEND BUILD_ONLY service-quotas) -endif() if("servicecatalog" IN_LIST FEATURES) list(APPEND BUILD_ONLY servicecatalog) endif() -if("servicecatalog-appregistry" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicecatalog-appregistry) -endif() if("servicediscovery" IN_LIST FEATURES) list(APPEND BUILD_ONLY servicediscovery) endif() -if("sesv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sesv2) -endif() if("shield" IN_LIST FEATURES) list(APPEND BUILD_ONLY shield) endif() if("signer" IN_LIST FEATURES) list(APPEND BUILD_ONLY signer) endif() -if("simspaceweaver" IN_LIST FEATURES) - list(APPEND BUILD_ONLY simspaceweaver) -endif() if("sms" IN_LIST FEATURES) list(APPEND BUILD_ONLY sms) endif() if("sms-voice" IN_LIST FEATURES) list(APPEND BUILD_ONLY sms-voice) endif() -if("snow-device-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY snow-device-management) -endif() if("snowball" IN_LIST FEATURES) list(APPEND BUILD_ONLY snowball) endif() @@ -977,24 +485,6 @@ endif() if("ssm" IN_LIST FEATURES) list(APPEND BUILD_ONLY ssm) endif() -if("ssm-contacts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-contacts) -endif() -if("ssm-incidents" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-incidents) -endif() -if("ssm-sap" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-sap) -endif() -if("sso" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso) -endif() -if("sso-admin" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso-admin) -endif() -if("sso-oidc" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso-oidc) -endif() if("states" IN_LIST FEATURES) list(APPEND BUILD_ONLY states) endif() @@ -1007,84 +497,36 @@ endif() if("support" IN_LIST FEATURES) list(APPEND BUILD_ONLY support) endif() -if("support-app" IN_LIST FEATURES) - list(APPEND BUILD_ONLY support-app) -endif() if("swf" IN_LIST FEATURES) list(APPEND BUILD_ONLY swf) endif() -if("synthetics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY synthetics) -endif() if("text-to-speech" IN_LIST FEATURES) list(APPEND BUILD_ONLY text-to-speech) endif() -if("textract" IN_LIST FEATURES) - list(APPEND BUILD_ONLY textract) -endif() -if("timestream-query" IN_LIST FEATURES) - list(APPEND BUILD_ONLY timestream-query) -endif() -if("timestream-write" IN_LIST FEATURES) - list(APPEND BUILD_ONLY timestream-write) -endif() -if("tnb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY tnb) -endif() if("transcribe" IN_LIST FEATURES) list(APPEND BUILD_ONLY transcribe) endif() -if("transcribestreaming" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transcribestreaming) -endif() if("transfer" IN_LIST FEATURES) list(APPEND BUILD_ONLY transfer) endif() if("translate" IN_LIST FEATURES) list(APPEND BUILD_ONLY translate) endif() -if("verifiedpermissions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY verifiedpermissions) -endif() -if("voice-id" IN_LIST FEATURES) - list(APPEND BUILD_ONLY voice-id) -endif() -if("vpc-lattice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY vpc-lattice) -endif() if("waf" IN_LIST FEATURES) list(APPEND BUILD_ONLY waf) endif() if("waf-regional" IN_LIST FEATURES) list(APPEND BUILD_ONLY waf-regional) endif() -if("wafv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wafv2) -endif() -if("wellarchitected" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wellarchitected) -endif() -if("wisdom" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wisdom) -endif() if("workdocs" IN_LIST FEATURES) list(APPEND BUILD_ONLY workdocs) endif() -if("worklink" IN_LIST FEATURES) - list(APPEND BUILD_ONLY worklink) -endif() if("workmail" IN_LIST FEATURES) list(APPEND BUILD_ONLY workmail) endif() -if("workmailmessageflow" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workmailmessageflow) -endif() if("workspaces" IN_LIST FEATURES) list(APPEND BUILD_ONLY workspaces) endif() -if("workspaces-web" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workspaces-web) -endif() if("xray" IN_LIST FEATURES) list(APPEND BUILD_ONLY xray) endif() diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1 index f10ee40e7a2..8c8b1a34268 100644 --- a/ports/aws-sdk-cpp/generateFeatures.ps1 +++ b/ports/aws-sdk-cpp/generateFeatures.ps1 @@ -1,35 +1,15 @@ [CmdletBinding()] param( - [Parameter(Mandatory=$true)][string]$SourcesRef, - [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, - [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" + [Parameter(Mandatory=$true)][string]$ExtractedSources, + [Parameter(Mandatory=$true)][string]$ControlFileIn, + [Parameter(Mandatory=$true)][string]$ControlFile, + [Parameter(Mandatory=$true)][string]$CMakeFragmentFile ) -$ErrorActionPreference = "Stop" +$subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-* -$ManifestIn = "$PortDirectory/vcpkg.in.json" -$ManifestOut = "$PortDirectory/vcpkg.json" -$CMakeFragmentFile = "$PortDirectory/compute_build_only.cmake" - -$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" -if (-not (Test-Path $ExtractedSources)) { - if (Test-Path "$ExtractedSources.tmp") { - Remove-Item -Force "$ExtractedSources.tmp" - } - git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host - git -c "$ExtractedSources.tmp" checkout $SourcesRef - Move-Item "$ExtractedSources.tmp" "$ExtractedSources" -} -Write-Host "Using sources directory: $ExtractedSources" - - -$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name - -$manifest = Get-Content $ManifestIn | ConvertFrom-Json -$manifest | Add-Member ` - -NotePropertyName '$note' ` - -NotePropertyValue 'Automatically generated by generateFeatures.ps1' -$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} +$controltext = gc $ControlFileIn +$controltext += @("# Automatically generated by generateFeatures.ps1") $cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1") @@ -40,46 +20,32 @@ function GetDescription($dir, $modulename) $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"") if ($descs.count -eq 1) { $desc = $descs[0].Matches.Value -replace "`"","" - "$desc" + "Description: $desc" } - else { "C++ SDK for the AWS $modulename service" } + else { "Description: C++ SDK for the AWS $modulename service" } } - else { "C++ SDK for the AWS $modulename service" } + else { "Description: C++ SDK for the AWS $modulename service" } } -$featureDependencies = @{} -Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches ` -| ForEach-Object { $_.Matches } ` -| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," ` -| Where-Object { $_ -ne "core" }) } +$subfolders | % { + $modulename = $_.name -replace "^aws-cpp-sdk-","" + if ($modulename -match "-tests`$") { return } + if ($modulename -match "-sample`$") { return } + if ($modulename -eq "core") { return } -foreach ($subfolder in $subfolders) -{ - $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" - if ($modulename -match "-tests`$") { continue } - if ($modulename -match "-sample`$") { continue } - if ($modulename -eq "core") { continue } - - $lowermodulename = $modulename.ToLower() - - $featureObj = @{ description = (GetDescription $subfolder $modulename) } - - if ($featureDependencies.ContainsKey($lowermodulename)) { - $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } - } - - $manifest.features.Add("$lowermodulename", $featureObj) + $controltext += @("") + $controltext += @("Feature: $modulename") + $controltext += @(GetDescription $_ $modulename) $cmakefragmenttext += @( - "if(`"$lowermodulename`" IN_LIST FEATURES)", + "if(`"$modulename`" IN_LIST FEATURES)", " list(APPEND BUILD_ONLY $modulename)", "endif()" ) } -[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) +Write-Verbose ($controltext -join "`n") +[IO.File]::WriteAllText($ControlFile, ($controltext -join "`n")+"`n") Write-Verbose ($cmakefragmenttext -join "`n") [IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n") - -& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut 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 deleted file mode 100644 index 0f7a3b19183..00000000000 --- a/ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/aws-cpp-sdk-core/CMakeLists.txt b/src/aws-cpp-sdk-core/CMakeLists.txt -index c44546b0e..b66888362 100644 ---- a/src/aws-cpp-sdk-core/CMakeLists.txt -+++ b/src/aws-cpp-sdk-core/CMakeLists.txt -@@ -113,13 +113,8 @@ if(ENABLE_CURL_CLIENT) - int main() { - CURL* handle = curl_easy_init(); - return curl_easy_setopt(handle, CURLOPT_PROXY_SSLCERT, \"client.pem\"); }") -- if (CMAKE_CROSSCOMPILING) -- check_c_source_compiles("${CHECK_CURL_HAS_H2}" CURL_HAS_H2) -- check_c_source_compiles("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY) -- else() -- check_c_source_runs("${CHECK_CURL_HAS_H2}" CURL_HAS_H2) -- check_c_source_runs("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY) -- endif() -+ set(CURL_HAS_H2 OFF) -+ set(CURL_HAS_TLS_PROXY ON) - elseif(ENABLE_WINDOWS_CLIENT) - # NOTE: HTTP/2 is not supported when using IXML_HTTP_REQUEST_2 - if(USE_IXML_HTTP_REQUEST_2) diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch deleted file mode 100644 index 7d68126be59..00000000000 --- a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 41d220d5fa..f6ee9a2a74 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 99031ac1274..acff9cd82ec 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,55 +3,48 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF "${VERSION}" - SHA512 b1a07939dd40f635fdc5b5947c3d679e6a2482b5017a3b26801639785fa1cb3e88414dd216fe64d3fb984d812ff3e8c4103e9b4355d531e533b78f1fa2a7cb01 + REF 6b8d756658591088f0599e07dd72025c65c2aecb # 1.8.84 + SHA512 763d5e2fbfbe0aee4a5b803eba6e731a0712adf963b9e817a28ce6747e58abb47e5c811bf385f04b9c4a4cf0e768494d6efa2d6b5d788cf32ddd926435e788b6 + HEAD_REF master PATCHES - patch-relocatable-rpath.patch - fix-aws-root.patch - lock-curl-http-and-tls-settings.patch + 001-patch-relocatable-rpath.patch + 002-aws-c-common.patch + 003-fix-AWSSDKCONFIG.patch + 004-fix-check-c-source-runs.patch + 005-fix-cjson-sprintf.patch + 006-pjd-fix-compiler-warnings.patch + 007-lock-curl-http-and-tls-settings.patch + 008-disable-werror.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) -set(EXTRA_ARGS) +set(BUILD_ONLY core) + +include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) + if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(rpath "@loader_path") -elseif (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" - "-DGIT_EXECUTABLE=--invalid-git-executable--" - "-DGIT_FOUND=TRUE" - "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" - "-DANDROID_BUILD_ZLIB=FALSE" - "-DANDROID_BUILD_CURL=FALSE" - "-DANDROID_BUILD_OPENSSL=FALSE" - ) else() set(rpath "\$ORIGIN") endif() - -set(BUILD_ONLY core) -include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA OPTIONS - ${EXTRA_ARGS} - "-DENABLE_UNITY_BUILD=ON" - "-DENABLE_TESTING=OFF" - "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" + -DENABLE_UNITY_BUILD=ON + -DENABLE_TESTING=OFF + -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT} + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE "-DBUILD_ONLY=${BUILD_ONLY}" - "-DBUILD_DEPS=OFF" - "-DBUILD_SHARED_LIBS=OFF" - "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF" - "-DCMAKE_INSTALL_RPATH=${rpath}" - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_DEPS=OFF + -DCMAKE_INSTALL_RPATH=${rpath} ) -vcpkg_cmake_install() -foreach(TARGET IN LISTS BUILD_ONLY) - vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" 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_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) vcpkg_copy_pdbs() @@ -73,12 +66,12 @@ foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) endforeach() file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/nuget" - "${CURRENT_PACKAGES_DIR}/debug/nuget" + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/lib/pkgconfig + ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig + ${CURRENT_PACKAGES_DIR}/nuget + ${CURRENT_PACKAGES_DIR}/debug/nuget ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -93,9 +86,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${DEBUG_LIB_FILES}) endif() - file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") + file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") endif() -configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) +configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage index c526d2c4561..7f317648352 100644 --- a/ports/aws-sdk-cpp/usage +++ b/ports/aws-sdk-cpp/usage @@ -1,12 +1,5 @@ The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: - When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) - target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) + target_include_directories(main PRVATE ${AWSSDK_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) - - OR - - find_package(aws-cpp-sdk-core REQUIRED) - target_include_directories(main PRIVATE aws-cpp-sdk-core) - target_link_libraries(main PRIVATE aws-cpp-sdk-core) diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json deleted file mode 100644 index ef92a782dac..00000000000 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "aws-sdk-cpp", - "version": "1.11.160", - "description": "AWS SDK for C++", - "homepage": "https://github.com/aws/aws-sdk-cpp", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-crt-cpp", - { - "name": "curl", - "default-features": false, - "features": [ - "ssl" - ], - "platform": "!uwp & !windows" - }, - { - "name": "openssl", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ], - "default-features": [ - "dynamodb", - "kinesis", - "s3" - ] -} \ No newline at end of file diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json deleted file mode 100644 index ddb0e0bf1eb..00000000000 --- a/ports/aws-sdk-cpp/vcpkg.json +++ /dev/null @@ -1,1186 +0,0 @@ -{ - "$note": "Automatically generated by generateFeatures.ps1", - "name": "aws-sdk-cpp", - "version": "1.11.160", - "description": "AWS SDK for C++", - "homepage": "https://github.com/aws/aws-sdk-cpp", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-crt-cpp", - { - "name": "curl", - "default-features": false, - "features": [ - "ssl" - ], - "platform": "!uwp & !windows" - }, - { - "name": "openssl", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ], - "default-features": [ - "dynamodb", - "kinesis", - "s3" - ], - "features": { - "access-management": { - "description": "C++ SDK for the AWS access-management service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "cognito-identity", - "iam" - ] - } - ] - }, - "accessanalyzer": { - "description": "C++ SDK for the AWS accessanalyzer service" - }, - "account": { - "description": "C++ SDK for the AWS account service" - }, - "acm": { - "description": "C++ SDK for the AWS acm service" - }, - "acm-pca": { - "description": "C++ SDK for the AWS acm-pca service" - }, - "alexaforbusiness": { - "description": "C++ SDK for the AWS alexaforbusiness service" - }, - "amp": { - "description": "C++ SDK for the AWS amp service" - }, - "amplify": { - "description": "C++ SDK for the AWS amplify service" - }, - "amplifybackend": { - "description": "C++ SDK for the AWS amplifybackend service" - }, - "amplifyuibuilder": { - "description": "C++ SDK for the AWS amplifyuibuilder service" - }, - "apigateway": { - "description": "C++ SDK for the AWS apigateway service" - }, - "apigatewaymanagementapi": { - "description": "C++ SDK for the AWS apigatewaymanagementapi service" - }, - "apigatewayv2": { - "description": "C++ SDK for the AWS apigatewayv2 service" - }, - "appconfig": { - "description": "C++ SDK for the AWS appconfig service" - }, - "appconfigdata": { - "description": "C++ SDK for the AWS appconfigdata service" - }, - "appfabric": { - "description": "C++ SDK for the AWS appfabric service" - }, - "appflow": { - "description": "C++ SDK for the AWS appflow service" - }, - "appintegrations": { - "description": "C++ SDK for the AWS appintegrations service" - }, - "application-autoscaling": { - "description": "C++ SDK for the AWS application-autoscaling service" - }, - "application-insights": { - "description": "C++ SDK for the AWS application-insights service" - }, - "applicationcostprofiler": { - "description": "C++ SDK for the AWS applicationcostprofiler service" - }, - "appmesh": { - "description": "C++ SDK for the AWS appmesh service" - }, - "apprunner": { - "description": "C++ SDK for the AWS apprunner service" - }, - "appstream": { - "description": "C++ SDK for the AWS appstream service" - }, - "appsync": { - "description": "C++ SDK for the AWS appsync service" - }, - "arc-zonal-shift": { - "description": "C++ SDK for the AWS arc-zonal-shift service" - }, - "athena": { - "description": "C++ SDK for the AWS athena service" - }, - "auditmanager": { - "description": "C++ SDK for the AWS auditmanager service" - }, - "autoscaling": { - "description": "C++ SDK for the AWS autoscaling service" - }, - "autoscaling-plans": { - "description": "C++ SDK for the AWS autoscaling-plans service" - }, - "awsmigrationhub": { - "description": "C++ SDK for the AWS AWSMigrationHub service" - }, - "awstransfer": { - "description": "C++ SDK for the AWS awstransfer service" - }, - "backup": { - "description": "C++ SDK for the AWS backup service" - }, - "backup-gateway": { - "description": "C++ SDK for the AWS backup-gateway service" - }, - "backupstorage": { - "description": "C++ SDK for the AWS backupstorage service" - }, - "batch": { - "description": "C++ SDK for the AWS batch service" - }, - "billingconductor": { - "description": "C++ SDK for the AWS billingconductor service" - }, - "braket": { - "description": "C++ SDK for the AWS braket service" - }, - "budgets": { - "description": "C++ SDK for the AWS budgets service" - }, - "ce": { - "description": "C++ SDK for the AWS ce service" - }, - "chime": { - "description": "C++ SDK for the AWS chime service" - }, - "chime-sdk-identity": { - "description": "C++ SDK for the AWS chime-sdk-identity service" - }, - "chime-sdk-media-pipelines": { - "description": "C++ SDK for the AWS chime-sdk-media-pipelines service" - }, - "chime-sdk-meetings": { - "description": "C++ SDK for the AWS chime-sdk-meetings service" - }, - "chime-sdk-messaging": { - "description": "C++ SDK for the AWS chime-sdk-messaging service" - }, - "chime-sdk-voice": { - "description": "C++ SDK for the AWS chime-sdk-voice service" - }, - "cleanrooms": { - "description": "C++ SDK for the AWS cleanrooms service" - }, - "cloud9": { - "description": "C++ SDK for the AWS cloud9 service" - }, - "cloudcontrol": { - "description": "C++ SDK for the AWS cloudcontrol service" - }, - "clouddirectory": { - "description": "C++ SDK for the AWS clouddirectory service" - }, - "cloudformation": { - "description": "C++ SDK for the AWS cloudformation service" - }, - "cloudfront": { - "description": "C++ SDK for the AWS cloudfront service" - }, - "cloudhsm": { - "description": "C++ SDK for the AWS cloudhsm service" - }, - "cloudhsmv2": { - "description": "C++ SDK for the AWS cloudhsmv2 service" - }, - "cloudsearch": { - "description": "C++ SDK for the AWS cloudsearch service" - }, - "cloudsearchdomain": { - "description": "C++ SDK for the AWS cloudsearchdomain service" - }, - "cloudtrail": { - "description": "C++ SDK for the AWS cloudtrail service" - }, - "cloudtrail-data": { - "description": "C++ SDK for the AWS cloudtrail-data service" - }, - "codeartifact": { - "description": "C++ SDK for the AWS codeartifact service" - }, - "codebuild": { - "description": "C++ SDK for the AWS codebuild service" - }, - "codecatalyst": { - "description": "C++ SDK for the AWS codecatalyst service" - }, - "codecommit": { - "description": "C++ SDK for the AWS codecommit service" - }, - "codedeploy": { - "description": "C++ SDK for the AWS codedeploy service" - }, - "codeguru-reviewer": { - "description": "C++ SDK for the AWS codeguru-reviewer service" - }, - "codeguru-security": { - "description": "C++ SDK for the AWS codeguru-security service" - }, - "codeguruprofiler": { - "description": "C++ SDK for the AWS codeguruprofiler service" - }, - "codepipeline": { - "description": "C++ SDK for the AWS codepipeline service" - }, - "codestar": { - "description": "C++ SDK for the AWS codestar service" - }, - "codestar-connections": { - "description": "C++ SDK for the AWS codestar-connections service" - }, - "codestar-notifications": { - "description": "C++ SDK for the AWS codestar-notifications service" - }, - "cognito-identity": { - "description": "C++ SDK for the AWS cognito-identity service" - }, - "cognito-idp": { - "description": "C++ SDK for the AWS cognito-idp service" - }, - "cognito-sync": { - "description": "C++ SDK for the AWS cognito-sync service" - }, - "comprehend": { - "description": "C++ SDK for the AWS comprehend service" - }, - "comprehendmedical": { - "description": "C++ SDK for the AWS comprehendmedical service" - }, - "compute-optimizer": { - "description": "C++ SDK for the AWS compute-optimizer service" - }, - "config": { - "description": "C++ SDK for the AWS config service" - }, - "connect": { - "description": "C++ SDK for the AWS connect service" - }, - "connect-contact-lens": { - "description": "C++ SDK for the AWS connect-contact-lens service" - }, - "connectcampaigns": { - "description": "C++ SDK for the AWS connectcampaigns service" - }, - "connectcases": { - "description": "C++ SDK for the AWS connectcases service" - }, - "connectparticipant": { - "description": "C++ SDK for the AWS connectparticipant service" - }, - "controltower": { - "description": "C++ SDK for the AWS controltower service" - }, - "cur": { - "description": "C++ SDK for the AWS cur service" - }, - "customer-profiles": { - "description": "C++ SDK for the AWS customer-profiles service" - }, - "databrew": { - "description": "C++ SDK for the AWS databrew service" - }, - "dataexchange": { - "description": "C++ SDK for the AWS dataexchange service" - }, - "datapipeline": { - "description": "C++ SDK for the AWS datapipeline service" - }, - "datasync": { - "description": "C++ SDK for the AWS datasync service" - }, - "dax": { - "description": "C++ SDK for the AWS dax service" - }, - "detective": { - "description": "C++ SDK for the AWS detective service" - }, - "devicefarm": { - "description": "C++ SDK for the AWS devicefarm service" - }, - "devops-guru": { - "description": "C++ SDK for the AWS devops-guru service" - }, - "directconnect": { - "description": "C++ SDK for the AWS directconnect service" - }, - "discovery": { - "description": "C++ SDK for the AWS discovery service" - }, - "dlm": { - "description": "C++ SDK for the AWS dlm service" - }, - "dms": { - "description": "C++ SDK for the AWS dms service" - }, - "docdb": { - "description": "C++ SDK for the AWS docdb service" - }, - "docdb-elastic": { - "description": "C++ SDK for the AWS docdb-elastic service" - }, - "drs": { - "description": "C++ SDK for the AWS drs service" - }, - "ds": { - "description": "C++ SDK for the AWS ds service" - }, - "dynamodb": { - "description": "C++ SDK for the AWS dynamodb service" - }, - "dynamodbstreams": { - "description": "C++ SDK for the AWS dynamodbstreams service" - }, - "ebs": { - "description": "C++ SDK for the AWS ebs service" - }, - "ec2": { - "description": "C++ SDK for the AWS ec2 service" - }, - "ec2-instance-connect": { - "description": "C++ SDK for the AWS ec2-instance-connect service" - }, - "ecr": { - "description": "C++ SDK for the AWS ecr service" - }, - "ecr-public": { - "description": "C++ SDK for the AWS ecr-public service" - }, - "ecs": { - "description": "C++ SDK for the AWS ecs service" - }, - "eks": { - "description": "C++ SDK for the AWS eks service" - }, - "elastic-inference": { - "description": "C++ SDK for the AWS elastic-inference service" - }, - "elasticache": { - "description": "C++ SDK for the AWS elasticache service" - }, - "elasticbeanstalk": { - "description": "C++ SDK for the AWS elasticbeanstalk service" - }, - "elasticfilesystem": { - "description": "C++ SDK for the AWS elasticfilesystem service" - }, - "elasticloadbalancing": { - "description": "C++ SDK for the AWS elasticloadbalancing service" - }, - "elasticloadbalancingv2": { - "description": "C++ SDK for the AWS elasticloadbalancingv2 service" - }, - "elasticmapreduce": { - "description": "C++ SDK for the AWS elasticmapreduce service" - }, - "elastictranscoder": { - "description": "C++ SDK for the AWS elastictranscoder service" - }, - "email": { - "description": "C++ SDK for the AWS email service" - }, - "emr-containers": { - "description": "C++ SDK for the AWS emr-containers service" - }, - "emr-serverless": { - "description": "C++ SDK for the AWS emr-serverless service" - }, - "entityresolution": { - "description": "C++ SDK for the AWS entityresolution service" - }, - "es": { - "description": "C++ SDK for the AWS es service" - }, - "eventbridge": { - "description": "C++ SDK for the AWS eventbridge service" - }, - "events": { - "description": "C++ SDK for the AWS events service" - }, - "evidently": { - "description": "C++ SDK for the AWS evidently service" - }, - "finspace": { - "description": "C++ SDK for the AWS finspace service" - }, - "finspace-data": { - "description": "C++ SDK for the AWS finspace-data service" - }, - "firehose": { - "description": "C++ SDK for the AWS firehose service" - }, - "fis": { - "description": "C++ SDK for the AWS fis service" - }, - "fms": { - "description": "C++ SDK for the AWS fms service" - }, - "forecast": { - "description": "C++ SDK for the AWS forecast service" - }, - "forecastquery": { - "description": "C++ SDK for the AWS forecastquery service" - }, - "frauddetector": { - "description": "C++ SDK for the AWS frauddetector 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" - }, - "globalaccelerator": { - "description": "C++ SDK for the AWS globalaccelerator service" - }, - "glue": { - "description": "C++ SDK for the AWS glue service" - }, - "grafana": { - "description": "C++ SDK for the AWS grafana service" - }, - "greengrass": { - "description": "C++ SDK for the AWS greengrass service" - }, - "greengrassv2": { - "description": "C++ SDK for the AWS greengrassv2 service" - }, - "groundstation": { - "description": "C++ SDK for the AWS groundstation service" - }, - "guardduty": { - "description": "C++ SDK for the AWS guardduty service" - }, - "health": { - "description": "C++ SDK for the AWS health service" - }, - "healthlake": { - "description": "C++ SDK for the AWS healthlake service" - }, - "honeycode": { - "description": "C++ SDK for the AWS honeycode service" - }, - "iam": { - "description": "C++ SDK for the AWS iam service" - }, - "identity-management": { - "description": "C++ SDK for the AWS identity-management service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "cognito-identity", - "sts" - ] - } - ] - }, - "identitystore": { - "description": "C++ SDK for the AWS identitystore service" - }, - "imagebuilder": { - "description": "C++ SDK for the AWS imagebuilder service" - }, - "importexport": { - "description": "C++ SDK for the AWS importexport service" - }, - "inspector": { - "description": "C++ SDK for the AWS inspector service" - }, - "inspector2": { - "description": "C++ SDK for the AWS inspector2 service" - }, - "internetmonitor": { - "description": "C++ SDK for the AWS internetmonitor service" - }, - "iot": { - "description": "C++ SDK for the AWS iot service" - }, - "iot-data": { - "description": "C++ SDK for the AWS iot-data service" - }, - "iot-jobs-data": { - "description": "C++ SDK for the AWS iot-jobs-data service" - }, - "iot-roborunner": { - "description": "C++ SDK for the AWS iot-roborunner service" - }, - "iot1click-devices": { - "description": "C++ SDK for the AWS iot1click-devices service" - }, - "iot1click-projects": { - "description": "C++ SDK for the AWS iot1click-projects service" - }, - "iotanalytics": { - "description": "C++ SDK for the AWS iotanalytics service" - }, - "iotdeviceadvisor": { - "description": "C++ SDK for the AWS iotdeviceadvisor service" - }, - "iotevents": { - "description": "C++ SDK for the AWS iotevents service" - }, - "iotevents-data": { - "description": "C++ SDK for the AWS iotevents-data service" - }, - "iotfleethub": { - "description": "C++ SDK for the AWS iotfleethub service" - }, - "iotfleetwise": { - "description": "C++ SDK for the AWS iotfleetwise service" - }, - "iotsecuretunneling": { - "description": "C++ SDK for the AWS iotsecuretunneling service" - }, - "iotsitewise": { - "description": "C++ SDK for the AWS iotsitewise service" - }, - "iotthingsgraph": { - "description": "C++ SDK for the AWS iotthingsgraph service" - }, - "iottwinmaker": { - "description": "C++ SDK for the AWS iottwinmaker service" - }, - "iotwireless": { - "description": "C++ SDK for the AWS iotwireless service" - }, - "ivs": { - "description": "C++ SDK for the AWS ivs service" - }, - "ivs-realtime": { - "description": "C++ SDK for the AWS ivs-realtime service" - }, - "ivschat": { - "description": "C++ SDK for the AWS ivschat service" - }, - "kafka": { - "description": "C++ SDK for the AWS kafka service" - }, - "kafkaconnect": { - "description": "C++ SDK for the AWS kafkaconnect service" - }, - "kendra": { - "description": "C++ SDK for the AWS kendra service" - }, - "kendra-ranking": { - "description": "C++ SDK for the AWS kendra-ranking service" - }, - "keyspaces": { - "description": "C++ SDK for the AWS keyspaces service" - }, - "kinesis": { - "description": "C++ SDK for the AWS kinesis service" - }, - "kinesis-video-archived-media": { - "description": "C++ SDK for the AWS kinesis-video-archived-media service" - }, - "kinesis-video-media": { - "description": "C++ SDK for the AWS kinesis-video-media service" - }, - "kinesis-video-signaling": { - "description": "C++ SDK for the AWS kinesis-video-signaling service" - }, - "kinesis-video-webrtc-storage": { - "description": "C++ SDK for the AWS kinesis-video-webrtc-storage service" - }, - "kinesisanalytics": { - "description": "C++ SDK for the AWS kinesisanalytics service" - }, - "kinesisanalyticsv2": { - "description": "C++ SDK for the AWS kinesisanalyticsv2 service" - }, - "kinesisvideo": { - "description": "C++ SDK for the AWS kinesisvideo service" - }, - "kms": { - "description": "C++ SDK for the AWS kms service" - }, - "lakeformation": { - "description": "C++ SDK for the AWS lakeformation service" - }, - "lambda": { - "description": "C++ SDK for the AWS lambda service" - }, - "lex": { - "description": "C++ SDK for the AWS lex service" - }, - "lex-models": { - "description": "C++ SDK for the AWS lex-models service" - }, - "lexv2-models": { - "description": "C++ SDK for the AWS lexv2-models service" - }, - "lexv2-runtime": { - "description": "C++ SDK for the AWS lexv2-runtime service" - }, - "license-manager": { - "description": "C++ SDK for the AWS license-manager service" - }, - "license-manager-linux-subscriptions": { - "description": "C++ SDK for the AWS license-manager-linux-subscriptions service" - }, - "license-manager-user-subscriptions": { - "description": "C++ SDK for the AWS license-manager-user-subscriptions service" - }, - "lightsail": { - "description": "C++ SDK for the AWS lightsail service" - }, - "location": { - "description": "C++ SDK for the AWS location service" - }, - "logs": { - "description": "C++ SDK for the AWS logs service" - }, - "lookoutequipment": { - "description": "C++ SDK for the AWS lookoutequipment service" - }, - "lookoutmetrics": { - "description": "C++ SDK for the AWS lookoutmetrics service" - }, - "lookoutvision": { - "description": "C++ SDK for the AWS lookoutvision service" - }, - "m2": { - "description": "C++ SDK for the AWS m2 service" - }, - "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" - }, - "managedblockchain": { - "description": "C++ SDK for the AWS managedblockchain service" - }, - "managedblockchain-query": { - "description": "C++ SDK for the AWS managedblockchain-query service" - }, - "marketplace-catalog": { - "description": "C++ SDK for the AWS marketplace-catalog service" - }, - "marketplace-entitlement": { - "description": "C++ SDK for the AWS marketplace-entitlement service" - }, - "marketplacecommerceanalytics": { - "description": "C++ SDK for the AWS marketplacecommerceanalytics service" - }, - "mediaconnect": { - "description": "C++ SDK for the AWS mediaconnect service" - }, - "mediaconvert": { - "description": "C++ SDK for the AWS mediaconvert service" - }, - "medialive": { - "description": "C++ SDK for the AWS medialive service" - }, - "mediapackage": { - "description": "C++ SDK for the AWS mediapackage service" - }, - "mediapackage-vod": { - "description": "C++ SDK for the AWS mediapackage-vod service" - }, - "mediapackagev2": { - "description": "C++ SDK for the AWS mediapackagev2 service" - }, - "mediastore": { - "description": "C++ SDK for the AWS mediastore service" - }, - "mediastore-data": { - "description": "C++ SDK for the AWS mediastore-data service" - }, - "mediatailor": { - "description": "C++ SDK for the AWS mediatailor service" - }, - "medical-imaging": { - "description": "C++ SDK for the AWS medical-imaging service" - }, - "memorydb": { - "description": "C++ SDK for the AWS memorydb service" - }, - "meteringmarketplace": { - "description": "C++ SDK for the AWS meteringmarketplace service" - }, - "mgn": { - "description": "C++ SDK for the AWS mgn service" - }, - "migration-hub-refactor-spaces": { - "description": "C++ SDK for the AWS migration-hub-refactor-spaces service" - }, - "migrationhub-config": { - "description": "C++ SDK for the AWS migrationhub-config service" - }, - "migrationhuborchestrator": { - "description": "C++ SDK for the AWS migrationhuborchestrator service" - }, - "migrationhubstrategy": { - "description": "C++ SDK for the AWS migrationhubstrategy service" - }, - "mobile": { - "description": "C++ SDK for the AWS mobile service" - }, - "monitoring": { - "description": "C++ SDK for the AWS monitoring service" - }, - "mq": { - "description": "C++ SDK for the AWS mq service" - }, - "mturk-requester": { - "description": "C++ SDK for the AWS mturk-requester service" - }, - "mwaa": { - "description": "C++ SDK for the AWS mwaa service" - }, - "neptune": { - "description": "C++ SDK for the AWS neptune service" - }, - "neptunedata": { - "description": "C++ SDK for the AWS neptunedata service" - }, - "network-firewall": { - "description": "C++ SDK for the AWS network-firewall service" - }, - "networkmanager": { - "description": "C++ SDK for the AWS networkmanager service" - }, - "nimble": { - "description": "C++ SDK for the AWS nimble service" - }, - "oam": { - "description": "C++ SDK for the AWS oam service" - }, - "omics": { - "description": "C++ SDK for the AWS omics service" - }, - "opensearch": { - "description": "C++ SDK for the AWS opensearch service" - }, - "opensearchserverless": { - "description": "C++ SDK for the AWS opensearchserverless service" - }, - "opsworks": { - "description": "C++ SDK for the AWS opsworks service" - }, - "opsworkscm": { - "description": "C++ SDK for the AWS opsworkscm service" - }, - "organizations": { - "description": "C++ SDK for the AWS organizations service" - }, - "osis": { - "description": "C++ SDK for the AWS osis service" - }, - "outposts": { - "description": "C++ SDK for the AWS outposts service" - }, - "panorama": { - "description": "C++ SDK for the AWS panorama service" - }, - "payment-cryptography": { - "description": "C++ SDK for the AWS payment-cryptography service" - }, - "payment-cryptography-data": { - "description": "C++ SDK for the AWS payment-cryptography-data service" - }, - "pca-connector-ad": { - "description": "C++ SDK for the AWS pca-connector-ad service" - }, - "personalize": { - "description": "C++ SDK for the AWS personalize service" - }, - "personalize-events": { - "description": "C++ SDK for the AWS personalize-events service" - }, - "personalize-runtime": { - "description": "C++ SDK for the AWS personalize-runtime service" - }, - "pi": { - "description": "C++ SDK for the AWS pi service" - }, - "pinpoint": { - "description": "C++ SDK for the AWS pinpoint service" - }, - "pinpoint-email": { - "description": "C++ SDK for the AWS pinpoint-email service" - }, - "pinpoint-sms-voice-v2": { - "description": "C++ SDK for the AWS pinpoint-sms-voice-v2 service" - }, - "pipes": { - "description": "C++ SDK for the AWS pipes service" - }, - "polly": { - "description": "C++ SDK for the AWS polly service" - }, - "pricing": { - "description": "C++ SDK for the AWS pricing service" - }, - "privatenetworks": { - "description": "C++ SDK for the AWS privatenetworks service" - }, - "proton": { - "description": "C++ SDK for the AWS proton service" - }, - "qldb": { - "description": "C++ SDK for the AWS qldb service" - }, - "qldb-session": { - "description": "C++ SDK for the AWS qldb-session service" - }, - "queues": { - "description": "C++ SDK for the AWS queues service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "sqs" - ] - } - ] - }, - "quicksight": { - "description": "C++ SDK for the AWS quicksight service" - }, - "ram": { - "description": "C++ SDK for the AWS ram service" - }, - "rbin": { - "description": "C++ SDK for the AWS rbin service" - }, - "rds": { - "description": "C++ SDK for the AWS rds service" - }, - "rds-data": { - "description": "C++ SDK for the AWS rds-data service" - }, - "redshift": { - "description": "C++ SDK for the AWS redshift service" - }, - "redshift-data": { - "description": "C++ SDK for the AWS redshift-data service" - }, - "redshift-serverless": { - "description": "C++ SDK for the AWS redshift-serverless service" - }, - "rekognition": { - "description": "C++ SDK for the AWS rekognition service" - }, - "resiliencehub": { - "description": "C++ SDK for the AWS resiliencehub service" - }, - "resource-explorer-2": { - "description": "C++ SDK for the AWS resource-explorer-2 service" - }, - "resource-groups": { - "description": "C++ SDK for the AWS resource-groups service" - }, - "resourcegroupstaggingapi": { - "description": "C++ SDK for the AWS resourcegroupstaggingapi service" - }, - "robomaker": { - "description": "C++ SDK for the AWS robomaker service" - }, - "rolesanywhere": { - "description": "C++ SDK for the AWS rolesanywhere service" - }, - "route53": { - "description": "C++ SDK for the AWS route53 service" - }, - "route53-recovery-cluster": { - "description": "C++ SDK for the AWS route53-recovery-cluster service" - }, - "route53-recovery-control-config": { - "description": "C++ SDK for the AWS route53-recovery-control-config service" - }, - "route53-recovery-readiness": { - "description": "C++ SDK for the AWS route53-recovery-readiness service" - }, - "route53domains": { - "description": "C++ SDK for the AWS route53domains service" - }, - "route53resolver": { - "description": "C++ SDK for the AWS route53resolver service" - }, - "rum": { - "description": "C++ SDK for the AWS rum service" - }, - "s3": { - "description": "C++ SDK for the AWS s3 service" - }, - "s3-crt": { - "description": "C++ SDK for the AWS s3-crt service" - }, - "s3-encryption": { - "description": "C++ SDK for the AWS s3-encryption service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "kms", - "s3" - ] - } - ] - }, - "s3control": { - "description": "C++ SDK for the AWS s3control service" - }, - "s3outposts": { - "description": "C++ SDK for the AWS s3outposts service" - }, - "sagemaker": { - "description": "C++ SDK for the AWS sagemaker service" - }, - "sagemaker-a2i-runtime": { - "description": "C++ SDK for the AWS sagemaker-a2i-runtime service" - }, - "sagemaker-edge": { - "description": "C++ SDK for the AWS sagemaker-edge service" - }, - "sagemaker-featurestore-runtime": { - "description": "C++ SDK for the AWS sagemaker-featurestore-runtime service" - }, - "sagemaker-geospatial": { - "description": "C++ SDK for the AWS sagemaker-geospatial service" - }, - "sagemaker-metrics": { - "description": "C++ SDK for the AWS sagemaker-metrics service" - }, - "sagemaker-runtime": { - "description": "C++ SDK for the AWS sagemaker-runtime service" - }, - "savingsplans": { - "description": "C++ SDK for the AWS savingsplans service" - }, - "scheduler": { - "description": "C++ SDK for the AWS scheduler service" - }, - "schemas": { - "description": "C++ SDK for the AWS schemas service" - }, - "sdb": { - "description": "C++ SDK for the AWS sdb service" - }, - "secretsmanager": { - "description": "C++ SDK for the AWS secretsmanager service" - }, - "securityhub": { - "description": "C++ SDK for the AWS securityhub service" - }, - "securitylake": { - "description": "C++ SDK for the AWS securitylake service" - }, - "serverlessrepo": { - "description": "C++ SDK for the AWS serverlessrepo service" - }, - "service-quotas": { - "description": "C++ SDK for the AWS service-quotas service" - }, - "servicecatalog": { - "description": "C++ SDK for the AWS servicecatalog service" - }, - "servicecatalog-appregistry": { - "description": "C++ SDK for the AWS servicecatalog-appregistry service" - }, - "servicediscovery": { - "description": "C++ SDK for the AWS servicediscovery service" - }, - "sesv2": { - "description": "C++ SDK for the AWS sesv2 service" - }, - "shield": { - "description": "C++ SDK for the AWS shield service" - }, - "signer": { - "description": "C++ SDK for the AWS signer service" - }, - "simspaceweaver": { - "description": "C++ SDK for the AWS simspaceweaver service" - }, - "sms": { - "description": "C++ SDK for the AWS sms service" - }, - "sms-voice": { - "description": "C++ SDK for the AWS sms-voice service" - }, - "snow-device-management": { - "description": "C++ SDK for the AWS snow-device-management service" - }, - "snowball": { - "description": "C++ SDK for the AWS snowball service" - }, - "sns": { - "description": "C++ SDK for the AWS sns service" - }, - "sqs": { - "description": "C++ SDK for the AWS sqs service" - }, - "ssm": { - "description": "C++ SDK for the AWS ssm service" - }, - "ssm-contacts": { - "description": "C++ SDK for the AWS ssm-contacts service" - }, - "ssm-incidents": { - "description": "C++ SDK for the AWS ssm-incidents service" - }, - "ssm-sap": { - "description": "C++ SDK for the AWS ssm-sap service" - }, - "sso": { - "description": "C++ SDK for the AWS sso service" - }, - "sso-admin": { - "description": "C++ SDK for the AWS sso-admin service" - }, - "sso-oidc": { - "description": "C++ SDK for the AWS sso-oidc service" - }, - "states": { - "description": "C++ SDK for the AWS states service" - }, - "storagegateway": { - "description": "C++ SDK for the AWS storagegateway service" - }, - "sts": { - "description": "C++ SDK for the AWS sts service" - }, - "support": { - "description": "C++ SDK for the AWS support service" - }, - "support-app": { - "description": "C++ SDK for the AWS support-app service" - }, - "swf": { - "description": "C++ SDK for the AWS swf service" - }, - "synthetics": { - "description": "C++ SDK for the AWS synthetics service" - }, - "text-to-speech": { - "description": "C++ SDK for the AWS text-to-speech service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "polly" - ] - } - ] - }, - "textract": { - "description": "C++ SDK for the AWS textract service" - }, - "timestream-query": { - "description": "C++ SDK for the AWS timestream-query service" - }, - "timestream-write": { - "description": "C++ SDK for the AWS timestream-write service" - }, - "tnb": { - "description": "C++ SDK for the AWS tnb service" - }, - "transcribe": { - "description": "C++ SDK for the AWS transcribe service" - }, - "transcribestreaming": { - "description": "C++ SDK for the AWS transcribestreaming service" - }, - "transfer": { - "description": "C++ SDK for the AWS transfer service", - "dependencies": [ - { - "name": "aws-sdk-cpp", - "default-features": false, - "features": [ - "s3" - ] - } - ] - }, - "translate": { - "description": "C++ SDK for the AWS translate service" - }, - "verifiedpermissions": { - "description": "C++ SDK for the AWS verifiedpermissions service" - }, - "voice-id": { - "description": "C++ SDK for the AWS voice-id service" - }, - "vpc-lattice": { - "description": "C++ SDK for the AWS vpc-lattice service" - }, - "waf": { - "description": "C++ SDK for the AWS waf service" - }, - "waf-regional": { - "description": "C++ SDK for the AWS waf-regional service" - }, - "wafv2": { - "description": "C++ SDK for the AWS wafv2 service" - }, - "wellarchitected": { - "description": "C++ SDK for the AWS wellarchitected service" - }, - "wisdom": { - "description": "C++ SDK for the AWS wisdom service" - }, - "workdocs": { - "description": "C++ SDK for the AWS workdocs service" - }, - "worklink": { - "description": "C++ SDK for the AWS worklink service" - }, - "workmail": { - "description": "C++ SDK for the AWS workmail service" - }, - "workmailmessageflow": { - "description": "C++ SDK for the AWS workmailmessageflow service" - }, - "workspaces": { - "description": "C++ SDK for the AWS workspaces service" - }, - "workspaces-web": { - "description": "C++ SDK for the AWS workspaces-web service" - }, - "xray": { - "description": "C++ SDK for the AWS xray service" - } - } -} diff --git a/tiledb/CMakeLists.txt b/tiledb/CMakeLists.txt index cb7306e40cd..f645c20439c 100644 --- a/tiledb/CMakeLists.txt +++ b/tiledb/CMakeLists.txt @@ -553,21 +553,12 @@ if (TILEDB_S3) target_link_libraries(TILEDB_CORE_OBJECTS_ILIB INTERFACE AWSSDK::aws-cpp-sdk-s3 - AWSSDK::aws-cpp-sdk-identity-management - AWSSDK::aws-cpp-sdk-sts AWSSDK::aws-cpp-sdk-core - AWSSDK::aws-crt-cpp - AWSSDK::aws-c-s3 - AWSSDK::aws-c-auth - AWSSDK::aws-c-mqtt - AWSSDK::aws-c-http AWSSDK::aws-c-event-stream - AWSSDK::aws-c-io - AWSSDK::aws-c-cal - AWSSDK::aws-c-sdkutils - AWSSDK::aws-c-compression + AWSSDK::aws-checksums AWSSDK::aws-c-common - AWSSDK::aws-checksums) + AWSSDK::aws-cpp-sdk-identity-management + AWSSDK::aws-cpp-sdk-sts) endif() endif() @@ -1008,21 +999,12 @@ if (TILEDB_STATIC) endforeach() elseif(TILEDB_S3) append_dep_lib(AWSSDK::aws-cpp-sdk-s3) - append_dep_lib(AWSSDK::aws-cpp-sdk-identity-management) - append_dep_lib(AWSSDK::aws-cpp-sdk-sts) append_dep_lib(AWSSDK::aws-cpp-sdk-core) - append_dep_lib(AWSSDK::aws-crt-cpp) - append_dep_lib(AWSSDK::aws-c-s3) - append_dep_lib(AWSSDK::aws-c-auth) - append_dep_lib(AWSSDK::aws-c-mqtt) - append_dep_lib(AWSSDK::aws-c-http) append_dep_lib(AWSSDK::aws-c-event-stream) - append_dep_lib(AWSSDK::aws-c-io) - append_dep_lib(AWSSDK::aws-c-cal) - append_dep_lib(AWSSDK::aws-c-sdkutils) - append_dep_lib(AWSSDK::aws-c-compression) - append_dep_lib(AWSSDK::aws-c-common) append_dep_lib(AWSSDK::aws-checksums) + append_dep_lib(AWSSDK::aws-c-common) + append_dep_lib(AWSSDK::aws-cpp-sdk-sts) + append_dep_lib(AWSSDK::aws-cpp-sdk-identity-management) endif() append_dep_lib(fmt::fmt) diff --git a/vcpkg.json b/vcpkg.json index 9c2fa1e3f84..145cec15a4b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -80,7 +80,7 @@ "dependencies": [ { "name": "aws-sdk-cpp", - "version>=": "1.11.160", + "version>=": "1.8.84", "features": ["s3", "identity-management", "sts"], "default-features": false }