Update submodules to latest stable versions

cmake/StaticBuild.cmake

@@ -141,16 +141,16 @@ if (ANDROID)
   endif()
   if(CMAKE_ANDROID_ARCH_ABI MATCHES x86_64)
     set(android_clang x86_64-linux-android${ANDROID_PLATFORM_LEVEL}-clang)
-    set(openssl_machine x86_64)
+    set(openssl_machine android-x86_64)
   elseif(CMAKE_ANDROID_ARCH_ABI MATCHES x86)
     set(android_clang i686-linux-android${ANDROID_PLATFORM_LEVEL}-clang)
-    set(openssl_machine i686)
+    set(openssl_machine android-x86)
   elseif(CMAKE_ANDROID_ARCH_ABI MATCHES armeabi-v7a)
     set(android_clang armv7a-linux-androideabi${ANDROID_PLATFORM_LEVEL}-clang)
-    set(openssl_machine armv7)
+    set(openssl_machine android-arm)
   elseif(CMAKE_ANDROID_ARCH_ABI MATCHES arm64-v8a)
     set(android_clang aarch64-linux-android${ANDROID_PLATFORM_LEVEL}-clang)
-    set(openssl_machine aarch64)
+    set(openssl_machine android-arm64)
   else()
     message(FATAL_ERROR "Don't know how to build for android arch abi ${CMAKE_ANDROID_ARCH_ABI}")
   endif()
@@ -276,16 +276,19 @@ add_static_target(zlib zlib_external libz.a)
 
 
 
-set(openssl_configure ./config)
+set(openssl_configure_extra)
 set(openssl_system_env "")
 set(openssl_cc "${deps_cc}")
 if(CMAKE_CROSSCOMPILING)
   if(ARCH_TRIPLET STREQUAL x86_64-w64-mingw32)
-    set(openssl_system_env SYSTEM=MINGW64 RC=${CMAKE_RC_COMPILER})
+    set(openssl_configure_extra mingw64)
+    set(openssl_system_env RC=${CMAKE_RC_COMPILER})
   elseif(ARCH_TRIPLET STREQUAL i686-w64-mingw32)
-    set(openssl_system_env SYSTEM=MINGW64 RC=${CMAKE_RC_COMPILER})
+    set(openssl_configure_extra mingw)
+    set(openssl_system_env RC=${CMAKE_RC_COMPILER})
   elseif(ANDROID)
-    set(openssl_system_env SYSTEM=Linux MACHINE=${openssl_machine} ${cross_extra})
+    set(openssl_configure_extra ${openssl_machine} -D__ANDROID_API__=21)
+    set(openssl_system_env ${cross_extra})
     set(openssl_extra_opts no-asm)
   elseif(IOS)
     get_filename_component(apple_toolchain "${CMAKE_C_COMPILER}" DIRECTORY)
@@ -299,10 +302,10 @@ if(CMAKE_CROSSCOMPILING)
   endif()
 endif()
 build_external(openssl
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${openssl_cc} ${openssl_system_env} ${openssl_configure}
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${openssl_cc} ${openssl_system_env} ./Configure ${openssl_configure_extra}
     --prefix=${DEPS_DESTDIR} --libdir=lib ${openssl_extra_opts}
     no-shared no-capieng no-dso no-dtls1 no-ec_nistp_64_gcc_128 no-gost
-    no-heartbeats no-md2 no-rc5 no-rdrand no-rfc3779 no-sctp no-ssl-trace no-ssl2 no-ssl3
+    no-md2 no-rc5 no-rdrand no-rfc3779 no-sctp no-ssl-trace no-ssl3
     no-static-engine no-tests no-weak-ssl-ciphers no-zlib-dynamic "CFLAGS=${deps_CFLAGS}"
   INSTALL_COMMAND make install_sw
   BUILD_BYPRODUCTS
@@ -312,7 +315,6 @@ build_external(openssl
 add_static_target(OpenSSL::SSL openssl_external libssl.a)
 add_static_target(OpenSSL::Crypto openssl_external libcrypto.a)
 set(OPENSSL_INCLUDE_DIR ${DEPS_DESTDIR}/include)
-set(OPENSSL_VERSION 1.1.1)
 
 
 

external/cpr

@@ -1 +1 @@
-Subproject commit aac5058a15e9ad5ad393973dc6fe44d7614a7f55
+Subproject commit 6ea2dec23c3df14ac3b27b7d2d6bbff0cb7ba1b0

external/fmt

@@ -1 +1 @@
-Subproject commit d141cdbeb0fb422a3fb7173b285fd38e0d1772dc
+Subproject commit b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9

external/ghc-filesystem

@@ -1 +1 @@
-Subproject commit 2a8b380f8d4e77b389c42a194ab9c70d8e3a0f1e
+Subproject commit cd6805e94dd5d6346be1b75a54cdc27787319dd2

external/libuv

@@ -1 +1 @@
-Subproject commit 1dff88e5161cba5c59276d2070d2e304e4dcb242
+Subproject commit e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2

external/uWebSockets

@@ -1 +1 @@
-Subproject commit b7c82d791010bd4c9b45528846f95b9886e9f984
+Subproject commit eea4b7e0f6e907646d34909e32f415c2a7dea385