mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
[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>
This commit is contained in:
parent
70391309f2
commit
06f8fd637d
@ -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"
|
||||
}
|
||||
|
@ -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")
|
||||
|
@ -4606,7 +4606,7 @@
|
||||
},
|
||||
"openssl": {
|
||||
"baseline": "1.1.1k",
|
||||
"port-version": 5
|
||||
"port-version": 6
|
||||
},
|
||||
"openssl-unix": {
|
||||
"baseline": "1.1.1h",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3",
|
||||
"version-string": "1.1.1k",
|
||||
"port-version": 6
|
||||
},
|
||||
{
|
||||
"git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7",
|
||||
"version-string": "1.1.1k",
|
||||
|
Loading…
x
Reference in New Issue
Block a user