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

Jump to bottom

[ngtcp2] fix: detect the libressl in vcpkg #40922

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −5
Open

[ngtcp2] fix: detect the libressl in vcpkg #40922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions ports/ngtcp2/openssl_required.patch → ports/ngtcp2/libressl_detected.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,9 +119,9 @@
@@ -119,9 +119,10 @@
if(ENABLE_GNUTLS)
find_package(GnuTLS 3.7.2)
endif()
if(ENABLE_OPENSSL)
- find_package(OpenSSL 1.1.1)
+ find_package(OpenSSL REQUIRED)
+ find_package(OPENSSL CONFIG NAMES LibreSSL REQUIRED)
+ set(OPENSSL_LIBRARIES "LibreSSL::SSL" "LibreSSL::TLS" "LibreSSL::Crypto")
endif()
if(ENABLE_WOLFSSL)
find_package(wolfssl 5.5.0)
Expand Down
2 changes: 1 addition & 1 deletion ports/ngtcp2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vcpkg_from_github(
SHA512 891a7339122f60b1796bb24d29ab75d0316717c2a64a45bade805242b70cb8713abc7642cdf0ec646ab9e80085d65117f0ea9b1e671d76bcd54038b0ea9bc868
HEAD_REF main
PATCHES
openssl_required.patch
libressl_detected.patch
popcnt_intrinsic.patch # https://github.com/ngtcp2/ngtcp2/pull/1351
)

Expand Down
2 changes: 1 addition & 1 deletion ports/ngtcp2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ngtcp2",
"version": "1.7.0",
"port-version": 1,
"port-version": 2,
"description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.",
"homepage": "https://github.com/ngtcp2/ngtcp2",
"license": "MIT",
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 @@ -6286,7 +6286,7 @@
},
"ngtcp2": {
"baseline": "1.7.0",
"port-version": 1
"port-version": 2
},
"nifly": {
"baseline": "1.0.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/n-/ngtcp2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "66b2a52d286e31f447902060c99dbb141c490c2f",
"version": "1.7.0",
"port-version": 2
},
{
"git-tree": "b0694dae4b89a7212beb478571821e45c3715335",
"version": "1.7.0",
Expand Down