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

[msh3] Sync patches and upstream [skip actions] #43018

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[msh3] Sync patches and upstream [skip actions] #43018

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
8 changes: 0 additions & 8 deletions ports/msh3/dependencies_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,3 @@ index c4c0814..f400566 100644

add_compile_definitions(WIN32_LEAN_AND_MEAN)
if(HAS_SPECTRE)
@@ -76,6 +73,7 @@ endif()
option(MSH3_USE_EXTERNAL_MSQUIC "Use an external msquic installation")
if(MSH3_USE_EXTERNAL_MSQUIC)
find_package(msquic CONFIG REQUIRED)
+ add_library(msquic_platform ALIAS msquic) # with ports/msquic/exports-for-msh3.diff
else()
# Configure and build
if (WIN32)
22 changes: 0 additions & 22 deletions ports/msquic/fix-comparing-system-processor-with-win32.patch
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ports/msquic/fix-install.patch
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions ports/msquic/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH QUIC_SOURCE_PATH
REPO microsoft/msquic
REF "v${VERSION}"
SHA512 c6e4b5f5d9b7e92469a6733a99eaf677909a5b2287869f0bbcc61fbcda6db4a6e920b327ede43fc9b1b0a3d09518c568dc1f38ad5fbb3ace14c1c031012b9968
REF #[[ "v${VERSION}" ]] bffa118e6d290319fd47db7c5e089e310c749d7d
SHA512 c4b15d8223c6970b803abb2457fda576e3642a324c9465f94fa47683b6aecc6b9aea2ec83352d28ac2777ac43958a2ae96930036c035bfb34369bc0778819b09
HEAD_REF master
PATCHES
fix-install.patch # Adjust install path of build outputs
fix-uwp-crt.patch # https://github.com/microsoft/msquic/pull/4373
fix-comparing-system-processor-with-win32.patch # https://github.com/microsoft/msquic/pull/4374
uwp-link-libs.diff
exports-for-msh3.diff
)
Expand Down
2 changes: 1 addition & 1 deletion ports/msquic/uwp-link-libs.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ index 4bf8117..4468b19 100644
+ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM-UWP")
elseif (${SYSTEM_PROCESSOR} STREQUAL "arm")
set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM")
elseif (${SYSTEM_PROCESSOR} STREQUAL "x86")
elseif (${SYSTEM_PROCESSOR} STREQUAL "win32" OR ${SYSTEM_PROCESSOR} STREQUAL "x86")
set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ONECORE")
elseif (${SYSTEM_PROCESSOR} STREQUAL "x64" OR ${SYSTEM_PROCESSOR} STREQUAL "amd64")
- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A-ONECORE")
Expand Down
Loading