mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 08:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openssl] Fix compile error on arm64-android (#33421)

Browse Source 
* [openssl] Fix compile error on arm64-android

* update version

---------

Co-authored-by: Zhao Liu <v-zhli17@microsoft.com>
This commit is contained in:
JonLiu1993 2023-08-30 12:56:38 -07:00 committed by GitHub
parent e21c414460
commit 39c703eb01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/openssl/unix/portfile.cmake
View File

@ -45,7 +45,7 @@ vcpkg_list(SET MAKEFILE_OPTIONS)
if(VCPKG_TARGET_IS_ANDROID)
set(ENV{ANDROID_NDK_ROOT} "${VCPKG_DETECTED_CMAKE_ANDROID_NDK}")
set(OPENSSL_ARCH "android-${VCPKG_DETECTED_CMAKE_ANDROID_ARCH}")
if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON)
if((VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" OR VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON)
vcpkg_list(APPEND CONFIGURE_OPTIONS no-asm)
endif()
elseif(VCPKG_TARGET_IS_LINUX)

2
ports/openssl/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "openssl",
"version": "3.1.2",
"port-version": 1,
"port-version": 2,
"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",
"license": "Apache-2.0",

2
versions/baseline.json
View File

@ -6094,7 +6094,7 @@
},
"openssl": {
"baseline": "3.1.2",
"port-version": 1
"port-version": 2
},
"openssl-unix": {
"baseline": "deprecated",

5
versions/o-/openssl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4e8e2c30ede50b2df35ecf5a0ee574076cfbe06f",
"version": "3.1.2",
"port-version": 2
},
{
"git-tree": "5a99562f8ac47a68a58efba5f0d40259fedeecc5",
"version": "3.1.2",