From be8bb993307bc77e56bcf2f7d156f523a9beb868 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:38:44 +0200 Subject: [PATCH] [openssl] Fix dynamic build on OSX (#24090) * [openssl] Fix dynamic build on OSX * version * Use SHLIB_VERSION * version --- ports/openssl/unix/CMakeLists.txt | 2 +- ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index c375f0f3518..d47193512f2 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -263,7 +263,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" - "${BUILDDIR}/libcrypto.1.1.dylib" + "${BUILDDIR}/libcrypto.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib" "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index dfde151f176..ff3927f0f22 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.2", - "port-version": 2, + "port-version": 3, "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", diff --git a/versions/baseline.json b/versions/baseline.json index bf7a1b59bc9..1b62c588b74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5158,7 +5158,7 @@ }, "openssl": { "baseline": "3.0.2", - "port-version": 2 + "port-version": 3 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 207c8962730..10a28745a12 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4", + "version": "3.0.2", + "port-version": 3 + }, { "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", "version": "3.0.2",