[openssl-unix] Fix openssl-unix android build (#11344)

* Fix openssl-unix android build

* Update version. Remove deprecated functions

* Update pacman before installing updates (perl fails to install otherwise)

* Update vcpkg_acquire_msys to (successfully) update pacman and bash before updating anything else

* Undo whitepsace remove

3 files changed, 5 insertions, 15 deletions

diff --git a/ports/openssl-unix/CMakeLists.txt b/ports/openssl-unix/CMakeLists.txt
index 2de8f98ce..b141a9126 100644
--- a/ports/openssl-unix/CMakeLists.txt
+++ b/ports/openssl-unix/CMakeLists.txt
@@ -5,9 +5,7 @@ if(NOT SOURCE_PATH)
     message(FATAL_ERROR "Requires SOURCE_PATH")

 endif()

 

-if(CMAKE_SYSTEM_NAME STREQUAL "Android")

-    set(PLATFORM android)

-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

+if(CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")

     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")

         set(PLATFORM linux-x86_64)

     else()

@@ -69,11 +67,6 @@ endif()
 

 get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY)

 

-

-file(READ "${BUILDDIR}/Configure" _contents)

-string(REPLACE "-mandroid" "" _contents "${_contents}")

-file(WRITE "${BUILDDIR}/Configure" "${_contents}")

-

 if(BUILD_SHARED_LIBS)

     set(SHARED shared)

     file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION

diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL
index ca6094ae5..0e1d8b8f6 100644
--- a/ports/openssl-unix/CONTROL
+++ b/ports/openssl-unix/CONTROL
@@ -1,4 +1,4 @@
 Source: openssl-unix
-Version: 1.1.1d-3
+Version: 1.1.1d-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.
 Supports: !(windows|uwp)
diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake
index 1c1bbae0c..d6e825e47 100644
--- a/ports/openssl-unix/portfile.cmake
+++ b/ports/openssl-unix/portfile.cmake
@@ -1,6 +1,4 @@
-include(vcpkg_common_functions)
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+if(VCPKG_TARGET_IS_WINDOWS)
     message(FATAL_ERROR "This port is only for openssl on Unix-like systems")
 endif()
 
@@ -28,9 +26,10 @@ vcpkg_extract_source_archive_ex(
 )
 
 if(CMAKE_HOST_WIN32)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl)
     set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
     set(MAKE ${MSYS_ROOT}/usr/bin/make.exe)
+    set(PERL ${MSYS_ROOT}/usr/bin/perl.exe)
 else()
     find_program(MAKE make)
     if(NOT MAKE)
@@ -64,5 +63,3 @@ file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_D
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl)
 endif()
-
-vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE)