The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
majaeger 2020-06-11 01:13:48 -07:00 committed by GitHub
parent 552f508ffc
commit 4050a5b279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/openssl-unix/CMakeLists.txt
View File

@ -5,9 +5,7 @@ if(NOT SOURCE_PATH)
message(FATAL_ERROR "Requires SOURCE_PATH") message(FATAL_ERROR "Requires SOURCE_PATH")
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Android") if(CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(PLATFORM android)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(PLATFORM linux-x86_64) set(PLATFORM linux-x86_64)
else() else()
@ -69,11 +67,6 @@ endif()
get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY) 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) if(BUILD_SHARED_LIBS)
set(SHARED shared) set(SHARED shared)
file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION

2
ports/openssl-unix/CONTROL
View File

@ -1,4 +1,4 @@
Source: openssl-unix 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. 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) Supports: !(windows|uwp)

9
ports/openssl-unix/portfile.cmake
View File

@ -1,6 +1,4 @@
include(vcpkg_common_functions) if(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
message(FATAL_ERROR "This port is only for openssl on Unix-like systems") message(FATAL_ERROR "This port is only for openssl on Unix-like systems")
endif() endif()
@ -28,9 +26,10 @@ vcpkg_extract_source_archive_ex(
) )
if(CMAKE_HOST_WIN32) 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(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
set(MAKE ${MSYS_ROOT}/usr/bin/make.exe) set(MAKE ${MSYS_ROOT}/usr/bin/make.exe)
set(PERL ${MSYS_ROOT}/usr/bin/perl.exe)
else() else()
find_program(MAKE make) find_program(MAKE make)
if(NOT 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") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl)
endif() endif()
vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE)