[aws-sdk-cpp] [openssl] Fix iOS build (#17338)

* Add curl try_compile parameters
Don't set compiler when compiling for iOS

* Update OpenSSL and AWS SDK for C++ port versions

* [vcpkg baseline][marble] Disable find I18n

* update version record

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix port-versions after merging master branch

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix merge conflicts

* Merge master branch

* Refactor OpenSSL's build script

* Refactor OpenSSL's build script

* Fix version

* Fix WASM build

* Fix version

* Fix disabled flags

* Disable treating warnings as errors

* Disable treating warnings as errors

* Fix hashes

* fix indentation

* [aws-sdk-cpp] use the powershell file to generate

* Fix versions after merging

* Fix versions after merging

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

2 files changed, 66 insertions, 63 deletions

diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index 4ce91228c..fd8481693 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -149,100 +149,103 @@ else()
     set(PATH_VAR ":$ENV{PATH}")
 endif()
 
-if(IOS)
+add_custom_command(
+        OUTPUT "${BUILDDIR}/Makefile"
+        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+        VERBATIM
+        WORKING_DIRECTORY "${BUILDDIR}"
+)
+
+if(NOT IOS)
     add_custom_command(
-            OUTPUT "${BUILDDIR}/Makefile"
-            COMMAND "${PERL}" Configure
-            ${SHARED}
-            ${DISABLES}
-            ${PLATFORM}
-            "--prefix=${CMAKE_INSTALL_PREFIX}"
-            "--openssldir=/etc/ssl"
-            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
-            VERBATIM
-            WORKING_DIRECTORY "${BUILDDIR}"
+        OUTPUT "${BUILDDIR}/Makefile"
+        COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
+        COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
+        COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
+        COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
+        COMMAND ${ENV_COMMAND} MAKE=${MAKE}
+        COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
+        VERBATIM
+        APPEND
     )
-elseif(EMSCRIPTEN)
+
+    if(EMSCRIPTEN)
+        list(APPEND DISABLES
+                threads
+                no-engine
+                no-dso
+                no-asm
+                no-shared
+                no-sse2
+                no-srtp
+                )
+    else()
+        list(APPEND DISABLES
+                enable-static-engine
+                no-zlib
+                no-ssl2
+                no-idea
+                no-cast
+                no-seed
+                no-md2
+                no-tests)
+    endif()
+endif()
+
+if(EMSCRIPTEN)
     add_custom_command(
             OUTPUT "${BUILDDIR}/Makefile"
-            COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
-            COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
-            COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
-            COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
-            COMMAND ${ENV_COMMAND} MAKE=${MAKE}
-            COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
-            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
             COMMAND "$ENV{EMSDK}/upstream/emscripten/emconfigure" ./config
             ${SHARED}
-            threads
-            no-engine
-            no-dso
-            no-asm
-            no-shared
-            no-sse2
-            no-srtp
             ${DISABLES}
             "--prefix=${CMAKE_INSTALL_PREFIX}"
             "--openssldir=/etc/ssl"
             "--cross-compile-prefix=\"/\""
-            COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
             VERBATIM
-            WORKING_DIRECTORY "${BUILDDIR}"
+            APPEND
     )
+
+    add_custom_target(build_libs ALL
+            COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
+            COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
+            COMMAND "${MAKE}" make build_libs
+            VERBATIM
+            WORKING_DIRECTORY "${BUILDDIR}"
+            DEPENDS "${BUILDDIR}/Makefile"
+            BYPRODUCTS ${INSTALL_LIBS}
+            )
 else()
     add_custom_command(
-        OUTPUT "${BUILDDIR}/Makefile"
-        COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
-        COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
-        COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
-        COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
-        COMMAND ${ENV_COMMAND} MAKE=${MAKE}
-        COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
-        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-        COMMAND "${PERL}" Configure
+            OUTPUT "${BUILDDIR}/Makefile"
+            COMMAND "${PERL}" Configure
             ${SHARED}
-            enable-static-engine
-            no-zlib
-            no-ssl2
-            no-idea
-            no-cast
-            no-seed
-            no-md2
-            no-tests
             ${DISABLES}
             ${PLATFORM}
             "--prefix=${CMAKE_INSTALL_PREFIX}"
             "--openssldir=/etc/ssl"
             ${CFLAGS}
-        COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
-        VERBATIM
-        WORKING_DIRECTORY "${BUILDDIR}"
+            VERBATIM
+            APPEND
     )
-endif()
 
-if(EMSCRIPTEN)
     add_custom_target(build_libs ALL
             COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
             COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
-            COMMAND "${MAKE}" make build_libs
-            COMMAND "${MAKE}" make -j ${VCPKG_CONCURRENCY} build_libs
+            COMMAND "${MAKE}" -j ${VCPKG_CONCURRENCY} build_libs
             VERBATIM
             WORKING_DIRECTORY "${BUILDDIR}"
             DEPENDS "${BUILDDIR}/Makefile"
             BYPRODUCTS ${INSTALL_LIBS}
             )
-else()
-    add_custom_target(build_libs ALL
-        COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
-        COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
-        COMMAND "${MAKE}" -j ${VCPKG_CONCURRENCY} build_libs
-        VERBATIM
-        WORKING_DIRECTORY "${BUILDDIR}"
-        DEPENDS "${BUILDDIR}/Makefile"
-        BYPRODUCTS ${INSTALL_LIBS}
-    )
 endif()
 
+add_custom_command(
+        OUTPUT "${BUILDDIR}/Makefile"
+        COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
+        VERBATIM
+        APPEND
+)
+
 if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND BUILD_SHARED_LIBS)
     if(DEFINED CMAKE_INSTALL_NAME_DIR)
         set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}")
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index d7a4a76e0..2d0eb1370 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version-string": "1.1.1k",
-  "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"
 }