Fix aws-sdk-cpp and OpenSSL cross-platform builds (#20289)

* Fix Aws Crypto Abstraction Layer and S2N builds * Fix aws-c-cal build * Revert changes * [s2n] update to 1.1.0 * Do not build tests for any of AWS SDK for C++ dependencies Remove unused flags from OpenSSL and AWS SDK for C++ builds * Update versions * Fix indentation * Fix indentation * Remove redundant flags * Remove redundant options * Update ports/aws-c-auth/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/002-no-exe-no-tests.patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-compression/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-crt-cpp/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-checksums/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-event-stream/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-s3/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-http/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-mqtt/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Simplify patch Restore PREFER_NINJA for OpenSSL build * Update versions * Replace deprecated methods * Update versions * Fix dependencies of OpenSSL * Fix dependencies of OpenSSL * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix versions * Revert quotation mark change * Revert quotation mark change * Revert quotation mark change * Patch AWS CRT for C++ for iOS build Do not copy sha256_profile tool when building aws-c-cal * Remove redundant flags * Fix indentation * Update versions * Update versions * Fix aws-c-cal build Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Fix library paths for Windows shared builds * Revert compiler check * Update versions * Fix indentation Revert OS check * Update versions * Fix indentation * Fix indentation * Fix indentation * Update versions/o-/openssl.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions * Update versions * Update versions Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com> Co-authored-by: Charles-Auguste Marois <cmarois@coveo.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2024-12-26 17:41:09 +08:00 · 2021-11-22 19:18:07 -03:00 · 2021-11-22 19:18:07 -03:00 · 8b4ff54ecd
commit 8b4ff54ecd
parent 868fc18364
42 changed files with 164 additions and 83 deletions
--- a/ports/aws-c-auth/portfile.cmake
+++ b/ports/aws-c-auth/portfile.cmake
@ -9,9 +9,9 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()
--- a/ports/aws-c-auth/vcpkg.json
+++ b/ports/aws-c-auth/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-auth",
  "version": "0.6.3",
+  "port-version": 1,
  "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.",
  "homepage": "https://github.com/awslabs/aws-c-auth",
  "supports": "!arm & !uwp",
--- a/ports/aws-c-cal/portfile.cmake
+++ b/ports/aws-c-cal/portfile.cmake
@ -10,20 +10,15 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
-	OPTIONS
+    OPTIONS
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()

 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-cal/cmake)

-vcpkg_copy_tools(
-    TOOL_NAMES sha256_profile
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    file(REMOVE_RECURSE 
        "${CURRENT_PACKAGES_DIR}/bin"
@ -32,10 +27,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()

 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/include"
+    "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-cal"
+    "${CURRENT_PACKAGES_DIR}/lib/aws-c-cal"
+    )

 vcpkg_copy_pdbs()

--- a/ports/aws-c-cal/vcpkg.json
+++ b/ports/aws-c-cal/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-cal",
  "version": "0.5.12",
+  "port-version": 1,
  "description": "C99 wrapper for cryptography primitives.",
  "homepage": "https://github.com/awslabs/aws-c-cal",
  "supports": "!arm & !uwp",
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@ -11,7 +11,8 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()
--- a/ports/aws-c-common/vcpkg.json
+++ b/ports/aws-c-common/vcpkg.json
@ -1,10 +1,12 @@
 {
  "name": "aws-c-common",
  "version": "0.6.9",
+  "port-version": 1,
  "description": "AWS common library for C",
  "homepage": "https://github.com/awslabs/aws-c-common",
  "supports": "!arm & !uwp",
  "dependencies": [
+    "openssl",
    {
      "name": "vcpkg-cmake",
      "host": true
--- a/ports/aws-c-compression/portfile.cmake
+++ b/ports/aws-c-compression/portfile.cmake
@ -9,9 +9,9 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()
--- a/ports/aws-c-compression/vcpkg.json
+++ b/ports/aws-c-compression/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-compression",
  "version": "0.2.14",
+  "port-version": 1,
  "description": "C99 implementation of huffman encoding/decoding",
  "homepage": "https://github.com/awslabs/aws-c-compression",
  "supports": "!arm & !uwp",
--- a/ports/aws-c-event-stream/portfile.cmake
+++ b/ports/aws-c-event-stream/portfile.cmake
@ -9,9 +9,9 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
-	OPTIONS
-		"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
+    OPTIONS
+        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()
--- a/ports/aws-c-event-stream/vcpkg.json
+++ b/ports/aws-c-event-stream/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-event-stream",
  "version": "0.2.7",
+  "port-version": 1,
  "description": "C99 implementation of the vnd.amazon.event-stream content-type.",
  "homepage": "https://github.com/awslabs/aws-c-event-stream",
  "supports": "!arm & !uwp",
--- a/ports/aws-c-http/portfile.cmake
+++ b/ports/aws-c-http/portfile.cmake
@ -9,20 +9,15 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()

 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-http/cmake)

-vcpkg_copy_tools(
-    TOOL_NAMES elasticurl
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    file(REMOVE_RECURSE 
        "${CURRENT_PACKAGES_DIR}/bin"
--- a/ports/aws-c-http/vcpkg.json
+++ b/ports/aws-c-http/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-http",
  "version": "0.6.5",
+  "port-version": 1,
  "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications",
  "homepage": "https://github.com/awslabs/aws-c-http",
  "supports": "!arm & !uwp",
--- a/ports/aws-c-io/portfile.cmake
+++ b/ports/aws-c-io/portfile.cmake
@ -9,9 +9,9 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
-	OPTIONS
+    OPTIONS
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()
--- a/ports/aws-c-io/vcpkg.json
+++ b/ports/aws-c-io/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-io",
  "version": "0.10.7",
+  "port-version": 1,
  "description": "Handles all IO and TLS work for application protocols.",
  "homepage": "https://github.com/awslabs/aws-c-io",
  "supports": "!arm & !uwp",
--- a/ports/aws-c-mqtt/portfile.cmake
+++ b/ports/aws-c-mqtt/portfile.cmake
@ -9,20 +9,15 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
-        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+         -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()

 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-mqtt/cmake)

-vcpkg_copy_tools(
-    TOOL_NAMES elastipubsub
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    file(REMOVE_RECURSE 
        "${CURRENT_PACKAGES_DIR}/bin"
--- a/ports/aws-c-mqtt/vcpkg.json
+++ b/ports/aws-c-mqtt/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-mqtt",
  "version": "0.7.6",
+  "port-version": 1,
  "description": "C99 implementation of the MQTT 3.1.1 specification.",
  "homepage": "https://github.com/awslabs/aws-c-mqtt",
  "supports": "!arm & !uwp",
--- a/ports/aws-c-s3/portfile.cmake
+++ b/ports/aws-c-s3/portfile.cmake
@ -9,9 +9,9 @@ vcpkg_from_github(

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()
--- a/ports/aws-c-s3/vcpkg.json
+++ b/ports/aws-c-s3/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "aws-c-s3",
  "version": "0.1.25",
+  "port-version": 1,
  "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",
  "supports": "!arm & !uwp",
--- a/ports/aws-checksums/portfile.cmake
+++ b/ports/aws-checksums/portfile.cmake
@ -15,10 +15,10 @@ endif()

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
    OPTIONS
-        "-DSTATIC_CRT=${STATIC_CRT_LNK}"
+        -DSTATIC_CRT=${STATIC_CRT_LNK}
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()
--- a/ports/aws-checksums/vcpkg.json
+++ b/ports/aws-checksums/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "aws-checksums",
  "version": "0.1.11",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
  "homepage": "https://github.com/awslabs/aws-checksums",
  "supports": "!arm",
--- a/ports/aws-crt-cpp/fix-ios-build.patch
+++ b/ports/aws-crt-cpp/fix-ios-build.patch
@ -0,0 +1,21 @@
+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(
--- a/ports/aws-crt-cpp/portfile.cmake
+++ b/ports/aws-crt-cpp/portfile.cmake
@ -5,6 +5,7 @@ vcpkg_from_github(
    SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463
    PATCHES
        fix-cmake-target-path.patch
+        fix-ios-build.patch
 )

 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
@ -14,19 +15,15 @@ vcpkg_cmake_configure(
    DISABLE_PARALLEL_CONFIGURE
    OPTIONS
        "-DSTATIC_CRT=${STATIC_CRT}"
-        "-DBUILD_DEPS=OFF"
+        -DBUILD_DEPS=OFF
        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )

 vcpkg_cmake_install()

 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-crt-cpp/cmake)

-vcpkg_copy_tools(
-    TOOL_NAMES elasticurl_cpp
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    file(REMOVE_RECURSE 
        "${CURRENT_PACKAGES_DIR}/bin"
--- a/ports/aws-crt-cpp/vcpkg.json
+++ b/ports/aws-crt-cpp/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "aws-crt-cpp",
  "version": "0.15.1",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
  "homepage": "https://github.com/awslabs/aws-crt-cpp",
  "supports": "!arm & !uwp",
--- a/ports/aws-sdk-cpp/fix-aws-root.patch
+++ b/ports/aws-sdk-cpp/fix-aws-root.patch
@ -1,16 +1,22 @@
 diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
-index 83eac0b..96bdbe7 100644
--- a/cmake/AWSSDKConfig.cmake
-+++ b/cmake/AWSSDKConfig.cmake
-@@ -63,11 +63,9 @@ endif()
+--- 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})
+ 
+-# 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
 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(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.")
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@ -15,12 +15,6 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
 set(EXTRA_ARGS)
 if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
    set(rpath "@loader_path")
-    set(EXTRA_ARGS
-            "-DCURL_HAS_H2_EXITCODE=0"
-            "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
-            "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
-            "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
-            )
 elseif (VCPKG_TARGET_IS_ANDROID)
    set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
            "-DGIT_EXECUTABLE=--invalid-git-executable--"
@ -29,11 +23,6 @@ elseif (VCPKG_TARGET_IS_ANDROID)
            "-DANDROID_BUILD_ZLIB=FALSE"
            "-DANDROID_BUILD_CURL=FALSE"
            "-DANDROID_BUILD_OPENSSL=FALSE"
-            "-DENABLE_HW_OPTIMIZATION=OFF"
-            "-DCURL_HAS_H2_EXITCODE=0"
-            "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
-            "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
-            "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
            )
 else()
    set(rpath "\$ORIGIN")
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@ -2,7 +2,7 @@
  "$note": "Automatically generated by generateFeatures.ps1",
  "name": "aws-sdk-cpp",
  "version": "1.9.96",
-  "port-version": 4,
+  "port-version": 5,
  "description": "AWS SDK for C++",
  "homepage": "https://github.com/aws/aws-sdk-cpp",
  "supports": "!arm & !uwp",
--- a/ports/openssl/unix/portfile.cmake
+++ b/ports/openssl/unix/portfile.cmake
@ -19,19 +19,16 @@ else()
    endif()
 endif()

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
-    PREFER_NINJA
    OPTIONS
        -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH}
        -DPERL=${PERL}
        -DMAKE=${MAKE}
        -DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY}
-    OPTIONS_RELEASE
-        -DINSTALL_HEADERS=ON
 )

-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_fixup_pkgconfig()

 file(GLOB HEADERS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h)
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@ -1,7 +1,17 @@
 {
  "name": "openssl",
  "version-string": "1.1.1l",
-  "port-version": 3,
+  "port-version": 4,
  "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
-  "homepage": "https://www.openssl.org"
+  "homepage": "https://www.openssl.org",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
--- a/versions/a-/aws-c-auth.json
+++ b/versions/a-/aws-c-auth.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "be9ae25111a5c7104d7c3769fcd581ee9f5dac7a",
+      "version": "0.6.3",
+      "port-version": 1
+    },
    {
      "git-tree": "09b8dcb5acc3e1f83c8b5e3f8b242db3d85f468b",
      "version": "0.6.3",
--- a/versions/a-/aws-c-cal.json
+++ b/versions/a-/aws-c-cal.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "33e7566ec2dc8cbc5ce91687b8627f946cdf231d",
+      "version": "0.5.12",
+      "port-version": 1
+    },
    {
      "git-tree": "6f3ed6a5199c30560f46d1be38cee72e3a77d62a",
      "version": "0.5.12",
--- a/versions/a-/aws-c-common.json
+++ b/versions/a-/aws-c-common.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "20a16524a9cc1079486d4efd5230562c8b9bed8a",
+      "version": "0.6.9",
+      "port-version": 1
+    },
    {
      "git-tree": "e0cf8500b71dc430f8d688db62f277b6c20a2a74",
      "version": "0.6.9",
--- a/versions/a-/aws-c-compression.json
+++ b/versions/a-/aws-c-compression.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "5892ebc8e23b264d832f03d4f7dfb04856dd8367",
+      "version": "0.2.14",
+      "port-version": 1
+    },
    {
      "git-tree": "e9dd3757cfe02e9e9d6d4d0bf772507c1be3794e",
      "version": "0.2.14",
--- a/versions/a-/aws-c-event-stream.json
+++ b/versions/a-/aws-c-event-stream.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4d0b2b6a72ae5ea454dc5378f9b3bc78320174ae",
+      "version": "0.2.7",
+      "port-version": 1
+    },
    {
      "git-tree": "0556f6ff7d7a2e270825de650d84e97c1ed2cf9b",
      "version": "0.2.7",
--- a/versions/a-/aws-c-http.json
+++ b/versions/a-/aws-c-http.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "470e20b38e215a550b52c002a7cc8a7f18938bf9",
+      "version": "0.6.5",
+      "port-version": 1
+    },
    {
      "git-tree": "21701228d8dca8d718f990273734749288100cdd",
      "version": "0.6.5",
--- a/versions/a-/aws-c-io.json
+++ b/versions/a-/aws-c-io.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "45b959b56caa21052a67c2b3d0b493a3e401288c",
+      "version": "0.10.7",
+      "port-version": 1
+    },
    {
      "git-tree": "fd430ec2c2c43582b0765a48e0a724d17747ae36",
      "version": "0.10.7",
--- a/versions/a-/aws-c-mqtt.json
+++ b/versions/a-/aws-c-mqtt.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "6dc42a5ba915723bed2997c39222b166a9f0a084",
+      "version": "0.7.6",
+      "port-version": 1
+    },
    {
      "git-tree": "a7ac0c5bddb07cc6ef49fe32f845efb230d28059",
      "version": "0.7.6",
--- a/versions/a-/aws-c-s3.json
+++ b/versions/a-/aws-c-s3.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "620ce24ba09dd971644750eedcbb42a8f1fc2457",
+      "version": "0.1.25",
+      "port-version": 1
+    },
    {
      "git-tree": "074cd08f0a073d8b1bfc551bd47435aa50ea96da",
      "version": "0.1.25",
--- a/versions/a-/aws-checksums.json
+++ b/versions/a-/aws-checksums.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "e70b465c6b8ce012ed176b822471dd440f853267",
+      "version": "0.1.11",
+      "port-version": 2
+    },
    {
      "git-tree": "120921754d48ecb075658abd01dc56b73e7f25f4",
      "version": "0.1.11",
--- a/versions/a-/aws-crt-cpp.json
+++ b/versions/a-/aws-crt-cpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d96290d0c6d34f9b4129e811e3b8fd2d62a699c7",
+      "version": "0.15.1",
+      "port-version": 2
+    },
    {
      "git-tree": "60880034065d31bf96ac71028dab62955a77ba55",
      "version": "0.15.1",
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2da283f5bdb07366001a8b14674c0961ac173566",
+      "version": "1.9.96",
+      "port-version": 5
+    },
    {
      "git-tree": "fc86d9dc77f15fb8c7c18f767cc21e01e024a8cc",
      "version": "1.9.96",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -258,47 +258,47 @@
    },
    "aws-c-auth": {
      "baseline": "0.6.3",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-cal": {
      "baseline": "0.5.12",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-common": {
      "baseline": "0.6.9",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-compression": {
      "baseline": "0.2.14",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-event-stream": {
      "baseline": "0.2.7",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-http": {
      "baseline": "0.6.5",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-io": {
      "baseline": "0.10.7",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-mqtt": {
      "baseline": "0.7.6",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-c-s3": {
      "baseline": "0.1.25",
-      "port-version": 0
+      "port-version": 1
    },
    "aws-checksums": {
      "baseline": "0.1.11",
-      "port-version": 1
+      "port-version": 2
    },
    "aws-crt-cpp": {
      "baseline": "0.15.1",
-      "port-version": 1
+      "port-version": 2
    },
    "aws-lambda-cpp": {
      "baseline": "0.2.7",
@ -306,7 +306,7 @@
    },
    "aws-sdk-cpp": {
      "baseline": "1.9.96",
-      "port-version": 4
+      "port-version": 5
    },
    "azmq": {
      "baseline": "2020-03-03",
@ -4986,7 +4986,7 @@
    },
    "openssl": {
      "baseline": "1.1.1l",
-      "port-version": 3
+      "port-version": 4
    },
    "openssl-unix": {
      "baseline": "1.1.1h",
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d25384246619019a1e44f018546cdfcaf1800174",
+      "version-string": "1.1.1l",
+      "port-version": 4
+    },
    {
      "git-tree": "83369bdefab234d8570ac2c0f3b616b0c4ab6cdf",
      "version-string": "1.1.1l",