Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[aws-sdk-cpp] Update AWS SDK for C++ and its dependencies (#29236)

This commit is contained in:
Ahmed Yarub Hani Al Nuaimi 2023-02-01 17:52:03 -03:00 committed by GitHub
parent 871e20cf67
commit ca9155913c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
65 changed files with 415 additions and 707 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ports/aws-c-auth/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a00afa..eba3d43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,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-auth-config.cmake b/cmake/aws-c-auth-config.cmake
index 430c1d7..6adbe53 100644
--- a/cmake/aws-c-auth-config.cmake
+++ b/cmake/aws-c-auth-config.cmake
@@ -5,9 +5,5 @@ find_dependency(aws-c-cal)
find_dependency(aws-c-io)
find_dependency(aws-c-http)
-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)

31
ports/aws-c-auth/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-auth
REF 61b6524960ad5e0c7aa2e38b343425d5941781bf # v0.6.3
SHA512 b5dda92e4a8796f3f1b8e2d326f57979a673f57325c921cdbc9c44273ada2f2a8eb6723f0292d223175ba4cca24508d2b635fad2af5ec7dd9e7b06db9588ede6
REF "v${VERSION}"
SHA512 f3b06d24d1a27a0cf548545a57acf3ae1c66ac09ed6c242f206c0237da7720f913726879bd26cbf8ff389ca935dd321a6a2228d0fde9d054322453e876bf30d2
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
@ -16,24 +15,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-auth/cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
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/aws-c-auth"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-auth"
)
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

5
ports/aws-c-auth/vcpkg.json
View File

@ -1,13 +1,14 @@
{
"name": "aws-c-auth",
"version": "0.6.3",
"port-version": 2,
"version": "0.6.22",
"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-common",
"aws-c-http",
"aws-c-sdkutils",
{
"name": "s2n",
"platform": "!uwp & !windows"

28
ports/aws-c-cal/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
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)

31
ports/aws-c-cal/portfile.cmake
View File

@ -1,11 +1,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-cal
REF c4c5b175e05f2affe5e3f0203ca6c8bc5cdd8f51 # v0.5.12
SHA512 25dd1d7f207f1324aed418555dda1c3d4ec64baf76431c9efd88fd3c34b163a2e5a6778192d2c0caf937f3efd31b2f21e6a0d0f7230684d176164da0e8bcc92e
REF "v${VERSION}"
SHA512 7cb52b0f000e38f4e4af392f67efbece607b2643cb9de8ca267d4416192e2c61f8f0bbcddbdb0f8e511cfe3feb890b00d69427b154c0f5e3853684e895f3b935
HEAD_REF master
PATCHES fix-cmake-target-path.patch
remove-libcrypto-messages.patch
PATCHES remove-libcrypto-messages.patch
)
vcpkg_cmake_configure(
@ -17,24 +16,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
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()
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/aws-c-cal"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-cal"
)
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

24
ports/aws-c-cal/remove-libcrypto-messages.patch
View File

@ -1,14 +1,14 @@
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)
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)
- 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}")
- 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}")
)

4
ports/aws-c-cal/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "aws-c-cal",
"version": "0.5.12",
"port-version": 2,
"version": "0.5.20",
"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",

28
ports/aws-c-common/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
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)

25
ports/aws-c-common/portfile.cmake
View File

@ -1,12 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
REF 68f28f8df258390744f3c5b460250f8809161041 # v0.6.20
SHA512 a8be405e0e1586a06db038a0068df2c9277772ff7b8df2c542d18d2aae4b2bc0fd89de668ab10d84476446834390e4e27383b68d86c7d9f0d0749b57802866f1
REF "v${VERSION}"
SHA512 713f705e28392d4009afddcd08acb6bdf7dc0e6129bcb90163c56976b3151774860b2d978944f057d010acdf14b7e66d70bf79066239d4fad571635f4353d4e5
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(
@ -17,18 +16,20 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-common/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
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}/]] "/")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-common"
)
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

3
ports/aws-c-common/vcpkg.json
View File

@ -1,8 +1,9 @@
{
"name": "aws-c-common",
"version": "0.6.20",
"version": "0.8.9",
"description": "AWS common library for C",
"homepage": "https://github.com/awslabs/aws-c-common",
"license": "Apache-2.0",
"supports": "!(windows & arm) & !uwp",
"dependencies": [
"openssl",

28
ports/aws-c-compression/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e70e013..0639229 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,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-compression-config.cmake b/cmake/aws-c-compression-config.cmake
index d919e90..707ce3a 100644
--- a/cmake/aws-c-compression-config.cmake
+++ b/cmake/aws-c-compression-config.cmake
@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-common)
-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)

22
ports/aws-c-compression/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-compression
REF 5fab8bc5ab5321d86f6d153b06062419080820ec # v0.2.14
SHA512 0063d0d644824d858211840115c17a33bfc2b67799e886c530ea8a42071b7bfc67bb6cf8135c538a292b8a7a6276b1d24bb7649f37ce335bc16938f2fca5cb7d
REF "v${VERSION}"
SHA512 6ca0a29ed97f3f83cce9d106d56a1ae7a9034caa63bfb3cdb29bb1ac4906738a940ffb0b85dede821ef0878bba7b2e9f5e627ae0d3acd99b24979e6567e5e6ae
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
@ -16,17 +15,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-compression/cmake)
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/aws-c-compression"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-compression"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

4
ports/aws-c-compression/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "aws-c-compression",
"version": "0.2.14",
"port-version": 2,
"version": "0.2.16",
"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",

28
ports/aws-c-event-stream/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
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)

24
ports/aws-c-event-stream/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-event-stream
REF e87537be561d753ec82e783bc0929b1979c585f8 # v0.2.7
SHA512 651b05ba6d87ad8f65f6cf7e8940b7ea500722848f3e65c2de0bf84d2e6321d0aa1631d4f64a78cf5ed5ed5adac6805a4e91e5c31b3ae86e8c37afb38da4c786
REF "v${VERSION}"
SHA512 c92bb81e2dd1652a2aef2de391584055c44847736366f6c4afa4033529fdc64fc2ec5ea5604f33cc5fd755359e22dca9db7682f40cf75b187625d6670a68fdab
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
@ -16,17 +15,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-event-stream/cmake)
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/aws-c-event-stream"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream"
)
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

4
ports/aws-c-event-stream/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "aws-c-event-stream",
"version": "0.2.7",
"port-version": 2,
"version": "0.2.18",
"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",

28
ports/aws-c-http/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b0d8e5..d46b498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,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-http-config.cmake b/cmake/aws-c-http-config.cmake
index 8633305..eb7f364 100644
--- a/cmake/aws-c-http-config.cmake
+++ b/cmake/aws-c-http-config.cmake
@@ -3,9 +3,5 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-io)
find_dependency(aws-c-compression)
-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)

31
ports/aws-c-http/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-http
REF 6ff61d621c374ab763f94584d26b1d29baa81c2e # v0.6.5
SHA512 91a5f3c18e6c8d14368ad2b7275a1ebcc6398758f6b1f87ba6199998390a26e768e25c16b27f589e35371f7304b6784cfc21699ff724c811135f2f73732fe85b
REF "v${VERSION}"
SHA512 ed5d70d89721e5e850d6ee648b4105911236474538bef5b50ece15695625647b131b27557682eaa8ff01fc3da0f537befe31a1db39ad65bbb9ed4e9e6b8927a9
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
@ -16,24 +15,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-http/cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
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/aws-c-http"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-http"
)
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

4
ports/aws-c-http/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "aws-c-http",
"version": "0.6.5",
"port-version": 2,
"version": "0.7.3",
"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",

27
ports/aws-c-io/fix-cmake-target-path.patch
View File

@ -1,27 +0,0 @@
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)

24
ports/aws-c-io/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-io
REF cfe553a770e9c2d1c93b8cdfb870b9f2a46b436e # v0.10.22
SHA512 7a741f5b1c895ceb11f73b67828fd3623c180cb8a3863f3b63a67ac1437d2c47911d50510777b13ee66fd0a009ab09a8c83fd036a0fca2f25a0835f48f023de7
REF "v${VERSION}"
SHA512 d6efa6f6519ccdc31c3a9c33c0fb48548f9ed6b1845a4e3cafc945938faa138ae6478995bb8d2eac12a101cab05fa98662a34cc7ca62c2b2ffcfd6ef85394efa
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
@ -16,17 +15,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-io/cmake)
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/aws-c-io"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-io"
)
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

3
ports/aws-c-io/vcpkg.json
View File

@ -1,8 +1,9 @@
{
"name": "aws-c-io",
"version": "0.10.22",
"version": "0.13.14",
"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",

28
ports/aws-c-mqtt/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d80abb..36c027f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,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-mqtt-config.cmake b/cmake/aws-c-mqtt-config.cmake
index 4a4dcbb..2ad48d2 100644
--- a/cmake/aws-c-mqtt-config.cmake
+++ b/cmake/aws-c-mqtt-config.cmake
@@ -6,9 +6,5 @@ if (@MQTT_WITH_WEBSOCKETS@)
find_dependency(aws-c-http)
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)

31
ports/aws-c-mqtt/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-mqtt
REF 0a70bf814845e487b7e4862af7ad9e4a1199b5f4 # v0.7.6
SHA512 9c8719004e9e4c56f270c5c5dcb41b5ecacb050dadf2a548ab2119a1a8f223c9117829346e2e86c8c77f6efe3502019085344fe4f470ccdd646dc87a3d4f4c3f
REF "v${VERSION}"
SHA512 7610494ef3cb56c89f7a70de7918a17a0674ed1686bfd7a0d72d45e53cbf93e68667f5b8ac4df104cafb394dc5d9f2f2fdea608ebd227ea63658859cc0cd5c8b
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
@ -16,24 +15,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-mqtt/cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
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/aws-c-mqtt"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-mqtt"
)
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

4
ports/aws-c-mqtt/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "aws-c-mqtt",
"version": "0.7.6",
"port-version": 3,
"version": "0.8.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-common",

28
ports/aws-c-s3/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 318b299..43f6d31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,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-s3-config.cmake b/cmake/aws-c-s3-config.cmake
index eb62a4b..24debd9 100644
--- a/cmake/aws-c-s3-config.cmake
+++ b/cmake/aws-c-s3-config.cmake
@@ -3,8 +3,4 @@ include(CMakeFindDependencyMacro)
find_dependency(aws-c-auth)
find_dependency(aws-c-http)
-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)
\ No newline at end of file

31
ports/aws-c-s3/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-s3
REF e38bdad12bd4c618e8d10489374d87e6ae3f7a19 # v0.1.25
SHA512 1ed3313419416ce28373968cb692cf67230b1efced4e187cd5047b146db3bc769dc283dff1af2e41b05ad6f50cbeea58718a34945a93645abacca2515f2a6cf1
REF "v${VERSION}"
SHA512 b0ebae3a2f2505c08d6c7bcba56f3a39ce5286619d6c2492d8aa3e3863e7067cf151a04f18e385eef9a2b7fbe375dd5f966c235ce3957e34ef2f2f22a9c4514f
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
vcpkg_cmake_configure(
@ -16,24 +15,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-s3/cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
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/aws-c-s3"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-s3"
)
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

4
ports/aws-c-s3/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "aws-c-s3",
"version": "0.1.25",
"port-version": 2,
"version": "0.2.3",
"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",

32
ports/aws-c-sdkutils/portfile.cmake Normal file
View File

@ -0,0 +1,32 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-sdkutils
REF "v${VERSION}"
SHA512 3c94a985a8952441eb5453ceea41ebb3aa3e075a6f2dcb3b013f2336a7c36dbcbc022696ac9e807bb25f563f969dd604a89b7ed7ef746170dda3cae0fc06262c
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")

19
ports/aws-c-sdkutils/vcpkg.json Normal file
View File

@ -0,0 +1,19 @@
{
"name": "aws-c-sdkutils",
"version": "0.1.7",
"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
}
]
}

25
ports/aws-checksums/fix-cmake-target-path.patch
View File

@ -1,25 +0,0 @@
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)

22
ports/aws-checksums/portfile.cmake
View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-checksums
REF 99bb0ad4b89d335d638536694352c45e0d2188f5 # v0.1.11
SHA512 cb9c249496fd41fda1efb9330e823d8b965adca6c8f372a50fe97eda821e277780bf9af8f5977102c44121568993cca55edbb750967b41f323e07e06a93c50a8
REF "v${VERSION}"
SHA512 3aae2e9818a1cec3e002c480a7979780b613c9f2389e719c6b35df9d118cd789bad48d9fbe348e20988cffafaee85f766a828be673a34d1963e775a1b951737b
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
if (VCPKG_CRT_LINKAGE STREQUAL static)
@ -23,17 +22,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-checksums/cmake)
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/aws-checksums"
"${CURRENT_PACKAGES_DIR}/lib/aws-checksums"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

4
ports/aws-checksums/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "aws-checksums",
"version": "0.1.11",
"port-version": 3,
"version": "0.1.14",
"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",

28
ports/aws-crt-cpp/fix-cmake-target-path.patch
View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d935e2..7b0501c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/aws-crt-cpp-config.cmake b/cmake/aws-crt-cpp-config.cmake
index 4b20a07..faac626 100644
--- a/cmake/aws-crt-cpp-config.cmake
+++ b/cmake/aws-crt-cpp-config.cmake
@@ -7,8 +7,4 @@ find_dependency(aws-c-auth)
find_dependency(aws-c-event-stream)
find_dependency(aws-c-s3)
-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)
\ No newline at end of file

21
ports/aws-crt-cpp/fix-ios-build.patch
View File

@ -1,21 +0,0 @@
diff --git a/source/io/TlsOptions.cpp b/source/io/TlsOptions.cpp
--- a/source/io/TlsOptions.cpp (revision 9ef58ff20df19e613c91c5f761e381c763da6810)
+++ b/source/io/TlsOptions.cpp (date 1635309758483)
@@ -90,7 +90,7 @@
return ctxOptions;
}
#endif /* !AWS_OS_IOS */
-#if defined(AWS_OS_APPLE)
+#if defined(AWS_OS_MACOS)
TlsContextOptions TlsContextOptions::InitClientWithMtlsPkcs12(
const char *pkcs12Path,
const char *pkcs12Pwd,
@@ -111,7 +111,7 @@
AWS_ASSERT(m_isInit);
return aws_tls_ctx_options_set_keychain_path(&m_options, &keychain_path) == 0;
}
-#endif /* AWS_OS_APPLE */
+#endif /* AWS_OS_MACOS */
#ifdef _WIN32
TlsContextOptions TlsContextOptions::InitClientWithMtlsSystemPath(

19
ports/aws-crt-cpp/no-werror.patch
View File

@ -1,16 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1a7964..7a5b1a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,9 +293,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE MATCHES Debug)
target_compile_definitions(${PROJECT_NAME} PRIVATE "-DDEBUG_BUILD")
#set extra warning flags for debug build
if (MSVC)
--- 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 ()
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 ()
endif()
endif()

27
ports/aws-crt-cpp/portfile.cmake
View File

@ -1,11 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-crt-cpp
REF 9ef58ff20df19e613c91c5f761e381c763da6810 # v0.15.1
SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463
REF "v${VERSION}"
SHA512 497bd9a127caaafe4b2a97c8f16fe3847085c59ac5ef43d1819bcb9cc6ad32fbd3d1ec507cb42810871a5e5ce08033a1a36aced0e250b2538bf905bf61459950
PATCHES
fix-cmake-target-path.patch
fix-ios-build.patch
no-werror.patch
)
@ -23,23 +21,18 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-crt-cpp/cmake)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()
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/aws-crt-cpp"
"${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp"
"${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/${PORT}"
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

3
ports/aws-crt-cpp/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "aws-crt-cpp",
"version": "0.15.1",
"port-version": 4,
"version": "0.19.5",
"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",

10
ports/aws-lambda-cpp/portfile.cmake
View File

@ -1,18 +1,18 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-lambda-cpp
REF 8bcd8a201f9da613581a2748ca737ab09adbdae5 # v0.2.7
SHA512 c59310dd839622cfc9ac2a1df5a492e9a6d629b671ed929813dbe51dfe76d4a4e381e78b11b206b66c2bee131a1544c3c8dfc4644981b708b589492763c7ed59
REF "v${VERSION}"
SHA512 846e288d60b7d73d502070e0367fa51fac9bfdbcab919832d6214010a70932bb79376351ae58e150aa45dd79bbe230f3813dbb5b05caf87044a9eab913551a5f
HEAD_REF master
)
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_cmake_install()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_copy_pdbs()
@ -23,4 +23,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/aws-lambda-runtime")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/aws-lambda-runtime")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

4
ports/aws-lambda-cpp/vcpkg.json
View File

@ -1,8 +1,8 @@
{
"name": "aws-lambda-cpp",
"version": "0.2.7",
"port-version": 1,
"version": "0.2.8",
"description": "C++ Runtime for AWS Lambda.",
"license": "Apache-2.0",
"supports": "linux",
"dependencies": [
"curl",

6
ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch
View File

@ -1,7 +1,7 @@
diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt
diff --git a/src/aws-cpp-sdk-core/CMakeLists.txt b/src/aws-cpp-sdk-core/CMakeLists.txt
index c44546b0e..b66888362 100644
--- a/aws-cpp-sdk-core/CMakeLists.txt
+++ b/aws-cpp-sdk-core/CMakeLists.txt
--- 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();

25
ports/aws-sdk-cpp/no-werror.patch
View File

@ -1,25 +0,0 @@
diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
index b316590ee..f17c27184 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 "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra")
+ list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-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.
@@ -148,11 +148,6 @@ macro(set_msvc_warnings)
set(CMAKE_SHARED_LINKER_FLAGS_DEBUGOPT "")
endif()
- # warnings as errors, max warning level (4)
- if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
- endif()
-
# taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

5
ports/aws-sdk-cpp/portfile.cmake
View File

@ -3,14 +3,13 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
REF a72b841c91bd421fbb6deb516400b51c06bc596c # 1.9.220
SHA512 9b7fa80ee155fa3c15e3e86c30b75c6019dc1672df711c4f656133fe005f104e4a30f5a99f1c0a0c6dab42007b5695169cd312bd0938b272c4c7b05765ce3421
REF "${VERSION}"
SHA512 d30a9cbe67aca41e98c799b55122ff97e9a935d2073ae4c1ca6545b68719236c0f2daf665cc3c0da4210e6e24e908a7a3cd0b826242e8fb5a97763f43e92b57a
PATCHES
patch-relocatable-rpath.patch
fix-aws-root.patch
fix-openssl3.patch
lock-curl-http-and-tls-settings.patch
no-werror.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)

4
ports/aws-sdk-cpp/vcpkg.json
View File

@ -1,10 +1,10 @@
{
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.9.220",
"port-version": 3,
"version": "1.11.4",
"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",

44
ports/s2n/fix-cmake-target-path.patch
View File

@ -1,28 +1,40 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 132f414..c7cfb5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,7 +503,7 @@ else()
--- a/CMakeLists.txt (revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b)
+++ b/CMakeLists.txt (date 1675011451052)
@@ -670,7 +670,7 @@
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake"
NAMESPACE AWS::
COMPONENT Development)
diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake
index 09d1c3a..4e76ed6 100644
--- a/cmake/s2n-config.cmake
+++ b/cmake/s2n-config.cmake
@@ -8,9 +8,5 @@ endif()
--- a/cmake/s2n-config.cmake (revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b)
+++ b/cmake/s2n-config.cmake (date 1675011032538)
@@ -6,21 +6,6 @@
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
find_dependency(LibCrypto)
-find_dependency(crypto)
-
-# Allow static or shared lib to be used.
-# If both are installed, choose based on BUILD_SHARED_LIBS.
-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
- if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/shared")
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
- else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
- endif()
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
- if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/static")
- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
- else()
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
- endif()
-endif()
+find_dependency(OpenSSL COMPONENTS Crypto)
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
\ No newline at end of file

9
ports/s2n/portfile.cmake
View File

@ -1,11 +1,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/s2n-tls
REF 36c3dc72ab1359cf721294e1258dfdc2962f3ffc # v1.3.5
SHA512 2c9eed12e90e5fc987758635fec4a7418c20d25c724cfa391090b06bfcc4eb5925b4011d51a99e7c7ab80f535684ee3934ba4734b7966edd323bf88bc5953d7c
REF "v${VERSION}"
SHA512 cfdfcdaa9d57427211e896845358da85d7498fa0478b6916dd34f36c755100c0421c07ccd624ed2d4baf9fcfe0dde6629159769619ac22e9ef1535ba20bf8979
PATCHES
fix-cmake-target-path.patch
use-openssl-crypto.patch
remove-trycompile.patch
)
@ -32,7 +31,7 @@ vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/s2n/cmake)
if(BUILD_TESTING)
message(STATUS Testing)
message(STATUS "Testing")
vcpkg_cmake_build(TARGET test LOGFILE_BASE test)
endif()
@ -45,4 +44,4 @@ file(REMOVE_RECURSE
)
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

49
ports/s2n/remove-trycompile.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision 86c857094a2d94fafce15a3d32abb4052e664c5c)
+++ b/CMakeLists.txt (date 1643340236796)
@@ -409,32 +409,6 @@
endif()
--- a/CMakeLists.txt (revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b)
+++ b/CMakeLists.txt (date 1675010024800)
@@ -393,55 +393,6 @@
message(STATUS "Enabling libcrypto interning")
endif()
-# Determine if EVP_md5_sha1 is available in libcrypto
@ -10,27 +10,50 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
- LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH
- ${CMAKE_BINARY_DIR}
- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c"
- LINK_LIBRARIES crypto ${OS_LIBS}
- CMAKE_FLAGS
- "-DINCLUDE_DIRECTORIES=$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>"
- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
-)
-if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
-endif()
-
-# Determine if RC4 is available in libcrypto
-try_compile(
- LIBCRYPTO_SUPPORTS_EVP_RC4
- ${CMAKE_BINARY_DIR}
- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_rc4.c"
- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
-)
-
-if (LIBCRYPTO_SUPPORTS_EVP_RC4)
- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_RC4)
-endif()
-
-# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto
-try_compile(
- LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX
- ${CMAKE_BINARY_DIR}
- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c"
- LINK_LIBRARIES crypto ${OS_LIBS}
- CMAKE_FLAGS
- "-DINCLUDE_DIRECTORIES=$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>"
- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
- CMAKE_FLAGS ${ADDITIONAL_FLAGS}
-)
-
-if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
-endif()
-
if (S2N_INTERN_LIBCRYPTO)
if (NOT LibCrypto_STATIC_LIBRARY)
message(FATAL_ERROR "libcrypto interning requires a static build of libcrypto.a to be available")
-# Determine if Kyber512 implementation from AWS-LC is available
-try_compile(
- LIBCRYPTO_SUPPORTS_EVP_KYBER_512
- ${CMAKE_BINARY_DIR}
- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_kyber_512.c"
- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
- COMPILE_DEFINITIONS "-Werror"
-)
-
-if(S2N_AWSLC_KYBER_UNSTABLE AND LIBCRYPTO_SUPPORTS_EVP_KYBER_512)
- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_KYBER512)
-endif()
-
if (NOT DEFINED CMAKE_AR)
message(STATUS "CMAKE_AR undefined, setting to `ar` by default")
SET(CMAKE_AR ar)

70
ports/s2n/use-openssl-crypto.patch
View File

@ -1,70 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edbf248..2992a05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -400,7 +400,7 @@ endif()
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
if (SEARCH_LIBCRYPTO)
- find_package(LibCrypto REQUIRED)
+ find_package(OpenSSL COMPONENTS Crypto REQUIRED)
else()
if (TARGET crypto)
message(STATUS "S2N found target: crypto")
@@ -465,7 +465,7 @@ if (S2N_INTERN_LIBCRYPTO)
)
endif()
else()
- target_link_libraries(${PROJECT_NAME} PUBLIC crypto)
+ target_link_libraries(${PROJECT_NAME} PUBLIC OpenSSL::Crypto)
endif()
target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m)
@@ -473,7 +473,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m)
target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/api> $<INSTALL_INTERFACE:include>)
-target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
if (BUILD_TESTING)
enable_testing()
@@ -485,7 +485,7 @@ if (BUILD_TESTING)
target_include_directories(testss2n PUBLIC tests)
target_compile_options(testss2n PRIVATE -std=gnu99)
target_link_libraries(testss2n PUBLIC ${PROJECT_NAME})
- target_include_directories(testss2n PUBLIC $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+ target_include_directories(testss2n PUBLIC $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
if (S2N_INTERN_LIBCRYPTO)
# if libcrypto was interned, rewrite libcrypto symbols so use of internal functions will link correctly
@@ -536,13 +536,13 @@ if (BUILD_TESTING)
add_executable(s2nc "bin/s2nc.c" "bin/echo.c" "bin/https.c" "bin/common.c")
target_link_libraries(s2nc ${PROJECT_NAME})
- target_include_directories(s2nc PRIVATE $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+ target_include_directories(s2nc PRIVATE $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(s2nc PRIVATE api)
target_compile_options(s2nc PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L)
add_executable(s2nd "bin/s2nd.c" "bin/echo.c" "bin/https.c" "bin/common.c")
target_link_libraries(s2nd ${PROJECT_NAME})
- target_include_directories(s2nd PRIVATE $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+ target_include_directories(s2nd PRIVATE $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(s2nd PRIVATE api)
target_compile_options(s2nd PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L)
diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake
index 4e76ed6..f714df0 100644
--- a/cmake/s2n-config.cmake
+++ b/cmake/s2n-config.cmake
@@ -5,8 +5,7 @@ if (NOT MSVC)
find_package(Threads REQUIRED)
endif()
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
-find_dependency(LibCrypto)
+find_dependency(OpenSSL COMPONENTS Crypto)
include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

3
ports/s2n/vcpkg.json
View File

@ -1,8 +1,9 @@
{
"name": "s2n",
"version": "1.3.5",
"version": "1.3.34",
"description": "C99 implementation of the TLS/SSL protocols.",
"homepage": "https://github.com/aws/s2n-tls",
"license": "Apache-2.0",
"supports": "!uwp & !windows",
"dependencies": [
"openssl",

5
versions/a-/aws-c-auth.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "51a9d9adaa80e798b6d856653cbece6dbc52c41c",
"version": "0.6.22",
"port-version": 0
},
{
"git-tree": "cdf9b6cb3b199b8ef1dec2e0d46bcfea7c8f536a",
"version": "0.6.3",

5
versions/a-/aws-c-cal.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9b46cbe5ae06bae580a43efd676aee7de00df08",
"version": "0.5.20",
"port-version": 0
},
{
"git-tree": "a383adb52cab94b360e30cf82c1be79a45a75875",
"version": "0.5.12",

5
versions/a-/aws-c-common.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d2ef01e925f6168e81c00ab304be70d312ea2ba9",
"version": "0.8.9",
"port-version": 0
},
{
"git-tree": "2f38081d38190d2b787b38df2ffe3804fea7746b",
"version": "0.6.20",

5
versions/a-/aws-c-compression.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "770807ecff5bc7a1d5387b956a643bf5e3205078",
"version": "0.2.16",
"port-version": 0
},
{
"git-tree": "107778b6c4b3c09105fcc9a08b31b252278538a4",
"version": "0.2.14",

5
versions/a-/aws-c-event-stream.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd36c61d2769534dbe9e4813e1269e88961ff5fe",
"version": "0.2.18",
"port-version": 0
},
{
"git-tree": "6a9e93d6dd8799afe5f56eeeda92793ba888691e",
"version": "0.2.7",

5
versions/a-/aws-c-http.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c097685110e260e91a1ac843ec20eba29f67574c",
"version": "0.7.3",
"port-version": 0
},
{
"git-tree": "845a574790e6fcd40bfc13cf0c65104d04e29350",
"version": "0.6.5",

5
versions/a-/aws-c-io.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "af0f6d934c56ef089365a8c27c8c9f183e554ef9",
"version": "0.13.14",
"port-version": 0
},
{
"git-tree": "4dc402977f4ed08054b2661b89a211064005e280",
"version": "0.10.22",

5
versions/a-/aws-c-mqtt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "240cc0cba578a941b0a23d8dfdbdaf930257b029",
"version": "0.8.5",
"port-version": 0
},
{
"git-tree": "028932fcffa607cc234348c2e2df454da7c4ccad",
"version": "0.7.6",

5
versions/a-/aws-c-s3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b320e0f3acafe6dc3733a511e4e2b7e2fadeda4d",
"version": "0.2.3",
"port-version": 0
},
{
"git-tree": "c571d95b22b5f84591bf4a115ca47c522371efce",
"version": "0.1.25",

9
versions/a-/aws-c-sdkutils.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "613cee18da297b892541b45ffe696560865052fb",
"version": "0.1.7",
"port-version": 0
}
]
}

5
versions/a-/aws-checksums.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "753f3e1f6c5054abb9ee014f45a4fcffd9a93678",
"version": "0.1.14",
"port-version": 0
},
{
"git-tree": "aeda736d7deef9292db2e43dc8702b2ddb5d59b0",
"version": "0.1.11",

5
versions/a-/aws-crt-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0473f0c74e9a4530d0b53d3298828eb42ce45ec4",
"version": "0.19.5",
"port-version": 0
},
{
"git-tree": "2247bebb1109b41b4a27e18d2c91812d23dfe55d",
"version": "0.15.1",

5
versions/a-/aws-lambda-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3197f40cb21eb35c009783d5d7a6f290b249fcd",
"version": "0.2.8",
"port-version": 0
},
{
"git-tree": "48030b34e22463cab36178bb50d3ce62257d6d56",
"version": "0.2.7",

5
versions/a-/aws-sdk-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "495471c4071406ec6929d77a553dc03ebd6df095",
"version": "1.11.4",
"port-version": 0
},
{
"git-tree": "53396d33cc22ee631dbfbb9b9a3a656ee3f4ea38",
"version": "1.9.220",

54
versions/baseline.json
View File

@ -297,56 +297,60 @@
"port-version": 0
},
"aws-c-auth": {
"baseline": "0.6.3",
"port-version": 2
"baseline": "0.6.22",
"port-version": 0
},
"aws-c-cal": {
"baseline": "0.5.12",
"port-version": 2
"baseline": "0.5.20",
"port-version": 0
},
"aws-c-common": {
"baseline": "0.6.20",
"baseline": "0.8.9",
"port-version": 0
},
"aws-c-compression": {
"baseline": "0.2.14",
"port-version": 2
"baseline": "0.2.16",
"port-version": 0
},
"aws-c-event-stream": {
"baseline": "0.2.7",
"port-version": 2
"baseline": "0.2.18",
"port-version": 0
},
"aws-c-http": {
"baseline": "0.6.5",
"port-version": 2
"baseline": "0.7.3",
"port-version": 0
},
"aws-c-io": {
"baseline": "0.10.22",
"baseline": "0.13.14",
"port-version": 0
},
"aws-c-mqtt": {
"baseline": "0.7.6",
"port-version": 3
"baseline": "0.8.5",
"port-version": 0
},
"aws-c-s3": {
"baseline": "0.1.25",
"port-version": 2
"baseline": "0.2.3",
"port-version": 0
},
"aws-c-sdkutils": {
"baseline": "0.1.7",
"port-version": 0
},
"aws-checksums": {
"baseline": "0.1.11",
"port-version": 3
"baseline": "0.1.14",
"port-version": 0
},
"aws-crt-cpp": {
"baseline": "0.15.1",
"port-version": 4
"baseline": "0.19.5",
"port-version": 0
},
"aws-lambda-cpp": {
"baseline": "0.2.7",
"port-version": 1
"baseline": "0.2.8",
"port-version": 0
},
"aws-sdk-cpp": {
"baseline": "1.9.220",
"port-version": 3
"baseline": "1.11.4",
"port-version": 0
},
"azmq": {
"baseline": "1.0.3",
@ -6873,7 +6877,7 @@
"port-version": 0
},
"s2n": {
"baseline": "1.3.5",
"baseline": "1.3.34",
"port-version": 0
},
"safeint": {

5
versions/s-/s2n.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2928707380a76632c3953b843ce34019fbf2c90c",
"version": "1.3.34",
"port-version": 0
},
{
"git-tree": "6eed0d44ebcda6eea8c4a79b37ee119b9125060a",
"version": "1.3.5",