diff options
| author | Lucius Q. User <31438459+Lucius-Q-User@users.noreply.github.com> | 2021-07-16 22:51:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 12:51:32 -0700 |
| commit | 588b1e66f9c18e0887eeaea8dfb49ff856acf683 (patch) | |
| tree | 6579634a6c3da6b0f2f2cfa3ce7b593f218ca87e | |
| parent | 0f059596124b7afce437e5dad4588fb3ff06719e (diff) | |
| download | vcpkg-588b1e66f9c18e0887eeaea8dfb49ff856acf683.tar.gz vcpkg-588b1e66f9c18e0887eeaea8dfb49ff856acf683.zip | |
[openssl] Fix x86-osx -> arm64-osx cross-compilation (#18630)
| -rw-r--r-- | ports/openssl/unix/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/openssl/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/openssl.json | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index fd8481693..d434cf1f8 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -76,7 +76,9 @@ elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}") endif() if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG) - set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") + set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") +elseif((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")) + set(CFLAGS "${CFLAGS} -mmacosx-version-min=11.0") endif() string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") @@ -168,7 +170,6 @@ if(NOT IOS) VERBATIM APPEND ) - if(EMSCRIPTEN) list(APPEND DISABLES threads diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 547f7ba5d..6dc21f493 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 6, + "port-version": 7, "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" } diff --git a/versions/baseline.json b/versions/baseline.json index ed8287a10..99807fbd1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4630,7 +4630,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 6 + "port-version": 7 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 21a4dfb25..474c91547 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705", + "version-string": "1.1.1k", + "port-version": 7 + }, + { "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3", "version-string": "1.1.1k", "port-version": 6 |