Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[msquic] Allow windows build without openssl #43031

Merged
merged 2 commits into from
Dec 31, 2024
Merged

[msquic] Allow windows build without openssl #43031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
020d647
[msquic] Allow windows build without openssl
dg0yt Dec 31, 2024
c0f929a
[vcpkg-ci-msh3] Cover schannel and openssl3 on windows
dg0yt Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions ports/msquic/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,20 @@ vcpkg_from_github(
exports-for-msh3.diff
)

vcpkg_from_github(
OUT_SOURCE_PATH OPENSSL_SOURCE_PATH
REPO quictls/openssl
REF openssl-3.1.7-quic1
SHA512 230f48a4ef20bfd492b512bd53816a7129d70849afc1426e9ce813273c01884d5474552ecaede05231ca354403f25e2325c972c9c7950ae66dae310800bd19e7
HEAD_REF openssl-3.1.7+quic
)
if(NOT EXISTS "${QUIC_SOURCE_PATH}/submodules/openssl3/Configure")
file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl3")
file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl3")
set(QUIC_TLS "schannel")
if("0-rtt" IN_LIST FEATURES)
set(QUIC_TLS "openssl3")
vcpkg_from_github(
OUT_SOURCE_PATH OPENSSL_SOURCE_PATH
REPO quictls/openssl
REF openssl-3.1.7-quic1
SHA512 230f48a4ef20bfd492b512bd53816a7129d70849afc1426e9ce813273c01884d5474552ecaede05231ca354403f25e2325c972c9c7950ae66dae310800bd19e7
HEAD_REF openssl-3.1.7+quic
)
if(NOT EXISTS "${QUIC_SOURCE_PATH}/submodules/openssl3/Configure")
file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl3")
file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl3")
endif()
endif()

vcpkg_from_github(
Expand Down Expand Up @@ -69,7 +73,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${QUIC_SOURCE_PATH}"
OPTIONS
-DQUIC_SOURCE_LINK=OFF
-DQUIC_TLS=openssl3
-DQUIC_TLS=${QUIC_TLS}
-DQUIC_USE_SYSTEM_LIBCRYPTO=OFF
-DQUIC_BUILD_PERF=OFF
-DQUIC_BUILD_TEST=OFF
Expand Down
19 changes: 18 additions & 1 deletion ports/msquic/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
{
"name": "msquic",
"version": "2.4.7",
"port-version": 1,
"description": "Cross-platform, C implementation of the IETF QUIC protocol",
"homepage": "https://github.com/microsoft/msquic",
"license": "MIT",
"supports": "!mingw & !(static & staticcrt)",
"dependencies": [
{
"name": "msquic",
"features": [
"0-rtt"
],
"platform": "!windows"
},
{
"name": "vcpkg-cmake",
"host": true
Expand All @@ -14,5 +22,14 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"features": {
"0-rtt": {
"description": [
"Enable 0-RTT connection support.",
"This feature requires the use of (a fork of) OpenSSL 3 also on Windows."
],
"license": "Apache-2.0"
}
}
}
7 changes: 7 additions & 0 deletions scripts/test_ports/vcpkg-ci-msh3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
"description": "Validates msh3",
"dependencies": [
"msh3",
{
"name": "msquic",
"features": [
"0-rtt"
],
"platform": "windows & !static"
},
{
"name": "vcpkg-cmake",
"host": true
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6186,7 +6186,7 @@
},
"msquic": {
"baseline": "2.4.7",
"port-version": 0
"port-version": 1
},
"mstch": {
"baseline": "1.0.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/msquic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e727b0b7e3bf5761f161c5f7ca8f24272a3f7f2",
"version": "2.4.7",
"port-version": 1
},
{
"git-tree": "04855f9144f78f05b623916dc4d7310fdf8b5d29",
"version": "2.4.7",
Expand Down
Loading