diff options
| author | Charles-Auguste Marois <cmarois@coveo.com> | 2021-09-14 22:06:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 19:06:34 -0700 |
| commit | 92af1ff59a651c1cf43aca48f54369a86d40d81c (patch) | |
| tree | a99d6a37e9745f7fde680b47b15a8e3c1308211a /ports/s2n | |
| parent | 5395ad9a4f29e5edef20cf20690089e9717f35f6 (diff) | |
| download | vcpkg-92af1ff59a651c1cf43aca48f54369a86d40d81c.tar.gz vcpkg-92af1ff59a651c1cf43aca48f54369a86d40d81c.zip | |
[aws-sdk-cpp] update to 1.9.96 (#20033)
* [aws-c-common] Update to 0.6.9
* [aws-checksums] Update to 0.1.11
* [aws-c-event-stream] Upgrade to 0.2.7
* Add aws-c-cal port
* Add s2n port
* Add port aws-c-io
* [aws-c-event-stream] Update port to 0.2.7
* Update aws-sdk-cpp port
* Add aws-c-compression port
* Add aws-c-auth port
* Add aws-c-http port
* Add aws-c-mqtt port
* Add aws-c-s3 port
* Add aws-crt-cpp port
* [aws-sdk-cpp] Update port to 1.9.91 version
* Fix port issues.
* Upgrade aws-sdk-cpp to 1.9.96
Upgrade aws-crt-cpp to 0.15.1
* Support x64-windows
* Fix format issues
* Specify supported triplets for aws libs
* Specify platforms for more aws libs
* Support x64-windows-static triplet.
* Fix format issue for aws-c-common
* Update port versions file
* Use new vcpkg cmake methods and format
* Use new vcpkg cmake methods and format
* update version
* Fix s2n port typo
* Fix s2n port typo
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/s2n')
| -rw-r--r-- | ports/s2n/fix-cmake-target-path.patch | 28 | ||||
| -rw-r--r-- | ports/s2n/portfile.cmake | 31 | ||||
| -rw-r--r-- | ports/s2n/vcpkg.json | 17 |
3 files changed, 76 insertions, 0 deletions
diff --git a/ports/s2n/fix-cmake-target-path.patch b/ports/s2n/fix-cmake-target-path.patch new file mode 100644 index 000000000..f83ac21e6 --- /dev/null +++ b/ports/s2n/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 132f414..c7cfb5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -503,7 +503,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ 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() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") + find_dependency(LibCrypto) + +-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/s2n/portfile.cmake b/ports/s2n/portfile.cmake new file mode 100644 index 000000000..ee7d23906 --- /dev/null +++ b/ports/s2n/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO aws/s2n-tls
+ REF b5b313b9ccddf268b30c642798f1d2a58d49ecd6 # v1.0.17
+ SHA512 59750c9a3c9330e2b26b84d45665b222d23475090736d8299f81352c839a09af10be0d49d34ced1dadae65ca255e819df45b648387e26b7dca31d74782fdb834
+ PATCHES fix-cmake-target-path.patch
+)
+
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
+ PREFER_NINJA
+)
+
+vcpkg_cmake_install()
+
+file(GLOB SHARED_CMAKE_FILES
+ "${CURRENT_PACKAGES_DIR}/debug/lib/s2n"
+ )
+file(COPY "${SHARED_CMAKE_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
+
+file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/debug"
+ "${CURRENT_PACKAGES_DIR}/lib/s2n"
+ )
+
+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)
diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json new file mode 100644 index 000000000..d1fda96ca --- /dev/null +++ b/ports/s2n/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "s2n", + "version": "1.0.17", + "description": "C99 implementation of the TLS/SSL protocols.", + "homepage": "https://github.com/aws/s2n-tls", + "supports": "!uwp & !windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} |