diff --git a/ports/msh3/dependencies_fix.patch b/ports/msh3/dependencies_fix.patch index e8ae8ac89f5797..831ec150072cb8 100644 --- 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 deleted file mode 100644 index 3f4f12eec288bf..00000000000000 --- a/ports/msquic/fix-comparing-system-processor-with-win32.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt -index a6c592951..0a0ddf0f8 100644 ---- a/submodules/CMakeLists.txt -+++ b/submodules/CMakeLists.txt -@@ -62,7 +62,7 @@ if (WIN32) - set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") - elseif (${SYSTEM_PROCESSOR} STREQUAL "arm") - set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") -- elseif (${SYSTEM_PROCESSOR} STREQUAL "win32") -+ elseif (${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") -@@ -75,7 +75,7 @@ if (WIN32) - set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") - elseif (${SYSTEM_PROCESSOR} STREQUAL "arm") - set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") -- elseif (${SYSTEM_PROCESSOR} STREQUAL "win32") -+ elseif (${SYSTEM_PROCESSOR} STREQUAL "x86") - set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32") - elseif (${SYSTEM_PROCESSOR} STREQUAL "x64" OR ${SYSTEM_PROCESSOR} STREQUAL "amd64") - set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A") diff --git a/ports/msquic/fix-install.patch b/ports/msquic/fix-install.patch deleted file mode 100644 index 9ffb36f53223d6..00000000000000 --- a/ports/msquic/fix-install.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt -index 18048e3..4fcd161 100644 ---- a/src/bin/CMakeLists.txt -+++ b/src/bin/CMakeLists.txt -@@ -11,6 +11,7 @@ endif() - - if(BUILD_SHARED_LIBS) - add_library(msquic SHARED ${SOURCES}) -+ target_include_directories(msquic PUBLIC $) - target_link_libraries(msquic PRIVATE core msquic_platform inc warnings logging base_link main_binary_link_args) - set_target_properties(msquic PROPERTIES OUTPUT_NAME ${QUIC_LIBRARY_NAME}) - if (NOT WIN32) -@@ -261,7 +262,10 @@ if(WIN32) - endif() - - if(BUILD_SHARED_LIBS) -- install(TARGETS msquic msquic_platform inc logging_inc warnings main_binary_link_args ${OTHER_TARGETS} EXPORT msquic DESTINATION lib) -+ install(TARGETS msquic EXPORT msquic -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) - else() - install(FILES ${QUIC_STATIC_LIBRARY} DESTINATION lib) - endif() diff --git a/ports/msquic/portfile.cmake b/ports/msquic/portfile.cmake index f0be5326f4fe83..34e2f264588d62 100644 --- 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 index 3dc68923ea58cc..5f4b79df02f998 100644 --- 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")