Skip to content

Commit cd41e8d

Browse files
committed
Allow system ssl to be used for ngtcp2
Move `libressl` into a feature like `curl`.
1 parent cb14871 commit cd41e8d

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

WindowsRequirements.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"brotli",
44
"libressl[tools]",
55
"nghttp2",
6-
"ngtcp2",
6+
"ngtcp2[libressl]",
77
"nghttp3",
88
"curl[libressl,http3,ipv6]",
99
"icu",

ports/ngtcp2/portfile.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ else ()
2424
set(NGTCP2_STATIC_LIB OFF)
2525
endif ()
2626

27+
# Each port of an OpenSSL equivalent checks to see that no other variant is installed so
28+
# just check to see if any OpenSSL variants are requested and if not use the system one
29+
set(USE_OPENSSL ON)
30+
if (NOT libressl IN_LIST FEATURES)
31+
message(STATUS "Using system SSL library")
32+
endif ()
33+
2734
vcpkg_configure_cmake(
2835
SOURCE_PATH ${SOURCE_PATH}
2936
PREFER_NINJA

ports/ngtcp2/vcpkg.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"homepage": "https://github.com/ngtcp2/ngtcp2",
66
"license": "MIT",
77
"dependencies": [
8-
"libressl",
98
{
109
"name": "vcpkg-cmake",
1110
"host": true
@@ -18,5 +17,13 @@
1817
"name": "vcpkg-cmake-webkit",
1918
"host": true
2019
}
21-
]
20+
],
21+
"features": {
22+
"libressl": {
23+
"description": "SSL support through libressl. If no SSL libraries are specified then the system SSL library will be used.",
24+
"dependencies": [
25+
"libressl"
26+
]
27+
}
28+
}
2229
}

0 commit comments

Comments
 (0)