From e3e75833800d0c5394b8e99b7cb74791f311245b Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:45:24 +0200 Subject: [PATCH] [openssl] Fix dynamic builds on UNIX (#24061) * [openssl] Fix dynamic builds on UNIX * version * Use version.dat * version --- ports/openssl/unix/CMakeLists.txt | 7 ++++--- ports/openssl/vcpkg.json | 2 +- ports/openssl/windows/portfile.cmake | 2 -- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 52bfcfff3c..c375f0f351 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -108,10 +108,11 @@ get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY) if(BUILD_SHARED_LIBS) set(SHARED shared) - file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION - REGEX "^#[\t ]*define[\t ]+SHLIB_VERSION_NUMBER[\t ]+\".*\".*") - string(REGEX REPLACE "^.*SHLIB_VERSION_NUMBER[\t ]+\"([^\"]*)\".*$" "\\1" + file(STRINGS "${BUILDDIR}/VERSION.dat" SHLIB_VERSION + REGEX "^SHLIB_VERSION=.*") + string(REGEX REPLACE "^(SHLIB_VERSION=)(.*)$" "\\2" SHLIB_VERSION "${SHLIB_VERSION}") + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") set(LIB_EXT dylib) set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT}) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index dd48bdec52..dfde151f17 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.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", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 2e85ec5f00..5cd4873002 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -183,5 +183,3 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - - diff --git a/versions/baseline.json b/versions/baseline.json index ff71a88cf1..4204a4a8cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5150,7 +5150,7 @@ }, "openssl": { "baseline": "3.0.2", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 113320c810..207c896273 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", + "version": "3.0.2", + "port-version": 2 + }, { "git-tree": "3505d3717ae864160fdb273eb2ec9d614eb6711e", "version": "3.0.2",