diff options
| author | Lev Stipakov <lev@openvpn.net> | 2021-07-01 20:21:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 10:21:44 -0700 |
| commit | 06f8fd637d928837e9484047f1e41c1b2159835c (patch) | |
| tree | 477a72828a5265711493a78632550bc9797fdbf9 | |
| parent | 70391309f25af52f0131dc94af9648d849ab44d0 (diff) | |
| download | vcpkg-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>
| -rw-r--r-- | ports/openssl/vcpkg.json | 2 | ||||
| -rw-r--r-- | ports/openssl/windows/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/openssl.json | 5 |
4 files changed, 11 insertions, 2 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") diff --git a/versions/baseline.json b/versions/baseline.json index 49a612380..492145402 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4606,7 +4606,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 5 + "port-version": 6 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 281a232db..21a4dfb25 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3", + "version-string": "1.1.1k", + "port-version": 6 + }, + { "git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7", "version-string": "1.1.1k", "port-version": 5 |