[msh3] Sync patches and upstream [skip actions]

microsoft · Jan 10, 2025 · b769299 · b769299
1 parent 1420fe2
commit b769299
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 59 deletions.
diff --git a/ports/msh3/dependencies_fix.patch b/ports/msh3/dependencies_fix.patch
@@ -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)
diff --git a/ports/msquic/fix-comparing-system-processor-with-win32.patch b/ports/msquic/fix-comparing-system-processor-with-win32.patch
diff --git a/ports/msquic/fix-install.patch b/ports/msquic/fix-install.patch
diff --git a/ports/msquic/portfile.cmake b/ports/msquic/portfile.cmake
@@ -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
 )

diff --git a/ports/msquic/uwp-link-libs.diff b/ports/msquic/uwp-link-libs.diff
@@ -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")