aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorLev Stipakov <lev@openvpn.net>2021-07-01 20:21:44 +0300
committerGitHub <noreply@github.com>2021-07-01 10:21:44 -0700
commit06f8fd637d928837e9484047f1e41c1b2159835c (patch)
tree477a72828a5265711493a78632550bc9797fdbf9 /ports
parent70391309f25af52f0131dc94af9648d849ab44d0 (diff)
downloadvcpkg-06f8fd637d928837e9484047f1e41c1b2159835c.tar.gz
vcpkg-06f8fd637d928837e9484047f1e41c1b2159835c.zip
[OpenSSL] support for "no-autoload-config" config option (#18389)
* [OpenSSL]: support for "no-autoload-config" config option OpenSSL has "no-autoload-config" config option, which disables automatic config loading: https://github.com/openssl/openssl/pull/5959 This patch allows to set above option via variable in custom triplet: # build-openssl-no-autoload-config.cmake set(OPENSSL_NO_AUTOLOAD_CONFIG ON) and use it like: vcpkg install --overlay-triplets=<path-to-triplets> \ openssl:build-openssl-no-autoload-config Signed-off-by: Lev Stipakov <lev@openvpn.net> * [OpenSSL] bump version Signed-off-by: Lev Stipakov <lev@openvpn.net>
Diffstat (limited to 'ports')
-rw-r--r--ports/openssl/vcpkg.json2
-rw-r--r--ports/openssl/windows/portfile.cmake4
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index cd7b732c0..547f7ba5d 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "openssl",
"version-string": "1.1.1k",
- "port-version": 5,
+ "port-version": 6,
"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/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 7a3bf08ed..3065abddc 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -29,6 +29,10 @@ if(DEFINED OPENSSL_USE_NOPINSHARED)
set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared)
endif()
+if(OPENSSL_NO_AUTOLOAD_CONFIG)
+ set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config)
+endif()
+
set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS})
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")