From c6dbe786dc5a14335a3c8e7ab17193b784d39d18 Mon Sep 17 00:00:00 2001 From: luncliff Date: Mon, 18 Nov 2024 01:16:17 +0900 Subject: [PATCH 1/2] [openssl3] fixup OpenSSLConfig.cmake --- ports/openssl3/portfile.cmake | 1 + ports/openssl3/vcpkg.json | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ports/openssl3/portfile.cmake b/ports/openssl3/portfile.cmake index bfc2f06d..693b772b 100644 --- a/ports/openssl3/portfile.cmake +++ b/ports/openssl3/portfile.cmake @@ -176,6 +176,7 @@ if(VCPKG_TARGET_IS_WINDOWS) include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") endif() vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenSSL" PACKAGE_NAME OpenSSL) if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES openssl AUTO_CLEAN) diff --git a/ports/openssl3/vcpkg.json b/ports/openssl3/vcpkg.json index fa776704..de5127da 100644 --- a/ports/openssl3/vcpkg.json +++ b/ports/openssl3/vcpkg.json @@ -1,9 +1,16 @@ { "name": "openssl3", "version-semver": "3.3.2", + "port-version": 1, "description": "TLS/SSL and crypto library", "homepage": "https://www.openssl.org/", "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Buind/Install OpenSSL CLI tools", From 540dd39090741f7715caacd38fe5b4de97e224ca Mon Sep 17 00:00:00 2001 From: luncliff Date: Mon, 18 Nov 2024 01:16:32 +0900 Subject: [PATCH 2/2] [openssl3] update baseline --- versions/baseline.json | 2 +- versions/o-/openssl3.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 842ae93a..dd1c166a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -178,7 +178,7 @@ }, "openssl3": { "baseline": "3.3.2", - "port-version": 0 + "port-version": 1 }, "psimd": { "baseline": "2020-05-17", diff --git a/versions/o-/openssl3.json b/versions/o-/openssl3.json index c8e2a42a..e0e93a55 100644 --- a/versions/o-/openssl3.json +++ b/versions/o-/openssl3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75624b98557e205222fa0df609897aaa73a0209c", + "version-semver": "3.3.2", + "port-version": 1 + }, { "git-tree": "4f69fff31d0114703d35d4df17e613da05c63e9c", "version-semver": "3.3.2",