[msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0 #42547

talregev · 2024-12-05T18:46:32Z

Changes comply with the maintainer guide.
SHA512s are updated for each updated download.
The "supports" clause reflects platforms that may be fixed by this new version.
Any fixed CI baseline entries are removed from that file.
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

talregev · 2024-12-05T18:47:38Z

msquic port installation complain about absolute paths that I don't know where it coming from:

-- Performing post-build validation
C:\src\vcpkg\ports\msquic\portfile.cmake: warning: There should be no absolute paths, such as the following, in an installed package. To suppress this message, add set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
note: C:\src\vcpkg\packages
note: C:\src\vcpkg\installed
note: C:\src\vcpkg\buildtrees
note: C:\src\vcpkg\downloads
C:\src\vcpkg\packages\msquic_x64-windows\share\msquic\msquic.cmake: note: absolute paths found here
C:\src\vcpkg\ports\msquic\portfile.cmake: warning: Found 1 post-build check problem(s). These are usually caused by bugs in portfile.cmake or the upstream build system. Please correct these before submitting this port to the curated registry.
Elapsed time to handle msquic:x64-windows: 6.4 min

BillyONeal · 2024-12-05T20:41:48Z

set_target_properties(OpenSSLQuic PROPERTIES
INTERFACE_LINK_LIBRARIES "$<$<NOT:$CONFIG:DEBUG>:$<$CONFIG:Debug:D:/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/debug/lib/libssl.lib>>;$<$CONFIG:DEBUG:$<$CONFIG:Debug:D:/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/debug/lib/libssl.lib>>;$<$<NOT:$CONFIG:DEBUG>:$<$CONFIG:Debug:D:/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/debug/lib/libcrypto.lib>>;$<$CONFIG:DEBUG:$<$CONFIG:Debug:D:/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/debug/lib/libcrypto.lib>>;$<$<NOT:$CONFIG:DEBUG>:$<$<NOT:$CONFIG:Debug>:D:/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/release/lib/libssl.lib>>;$<$CONFIG:DEBUG:$<$<NOT:$CONFIG:Debug>:D:/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/release/lib/libssl.lib>>;$<$<NOT:$CONFIG:DEBUG>:$<$<NOT:$CONFIG:Debug>:D:/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/release/lib/libcrypto.lib>>;$<$CONFIG:DEBUG:$<$<NOT:$CONFIG:Debug>:D:/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/release/lib/libcrypto.lib>>"
)

It looks like they're somehow vendoring a different OpenSSL despite FETCHCONTENT_FULLY_DISCONNECTED=ON?

if(QUIC_TLS STREQUAL "openssl" OR  QUIC_TLS STREQUAL "openssl3")
    add_library(OpenSSL INTERFACE)

    include(FetchContent)

    FetchContent_Declare(
        OpenSSLQuic
        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/submodules
        CMAKE_ARGS "-DQUIC_USE_SYSTEM_LIBCRYPTO=${QUIC_USE_SYSTEM_LIBCRYPTO}"
    )
    FetchContent_MakeAvailable(OpenSSLQuic)

    target_link_libraries(OpenSSL
        INTERFACE
        OpenSSLQuic::OpenSSLQuic
    )
endif()

talregev · 2024-12-05T22:53:55Z

msquic using quictls from the beginning of this port.
I understand now what happen:
I create a PR in upstream that will export the msquic_platform that needed for mhs v0.7.0.
for export msquic_platform is also needed to export OpenSSLQuic target.
When it export it, it export with absolute path:
Not sure what to do.

# Create imported target OpenSSLQuic
add_library(OpenSSLQuic INTERFACE IMPORTED)

set_target_properties(OpenSSLQuic PROPERTIES
  INTERFACE_LINK_LIBRARIES "\$<\$<NOT:\$<CONFIG:DEBUG>>:\$<\$<CONFIG:Debug>:C:/src/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/debug/lib/libssl.lib>>;\$<\$<CONFIG:DEBUG>:\$<\$<CONFIG:Debug>:C:/src/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/debug/lib/libssl.lib>>;\$<\$<NOT:\$<CONFIG:DEBUG>>:\$<\$<CONFIG:Debug>:C:/src/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/debug/lib/libcrypto.lib>>;\$<\$<CONFIG:DEBUG>:\$<\$<CONFIG:Debug>:C:/src/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/debug/lib/libcrypto.lib>>;\$<\$<NOT:\$<CONFIG:DEBUG>>:\$<\$<NOT:\$<CONFIG:Debug>>:C:/src/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/release/lib/libssl.lib>>;\$<\$<CONFIG:DEBUG>:\$<\$<NOT:\$<CONFIG:Debug>>:C:/src/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/release/lib/libssl.lib>>;\$<\$<NOT:\$<CONFIG:DEBUG>>:\$<\$<NOT:\$<CONFIG:Debug>>:C:/src/vcpkg/buildtrees/msquic/x64-windows-rel/_deps/opensslquic-build/openssl3/release/lib/libcrypto.lib>>;\$<\$<CONFIG:DEBUG>:\$<\$<NOT:\$<CONFIG:Debug>>:C:/src/vcpkg/buildtrees/msquic/x64-windows-dbg/_deps/opensslquic-build/openssl3/release/lib/libcrypto.lib>>"
)

talregev · 2024-12-05T22:54:41Z

@dg0yt do you have an idea how to solve it?
Thank you for your help.

BillyONeal · 2024-12-06T19:59:18Z

When it export it, it export with absolute path:

I believe the problem is that it is being fetchcontent'd; vcpkg_cmake_config_fixup doesn't know how to fix it up when it's being consumed from buildtrees rather than installed.

talregev · 2024-12-11T06:45:08Z

@BillyONeal @WangWeiLin-MV
The PR is ready for review.

ports/msh3/dependencies_fix.patch

talregev · 2024-12-12T04:48:08Z

@WangWeiLin-MV I answered @dg0yt review comments. This PR is ready for review.

dg0yt

The introduction of the misquic:: CMake namespace is merged upstream, but it is not yet part of a release and thus should not be yet accepted in the vcpkg registry.

AFAIU upstream was unaware of this change breaking downstream projects (e.g. requiring patching in port msh3 here.), and vcpkg should be concerned for the same reason.

I suggested a solution but it is not yet integrated.
microsoft/msquic#4701 (comment)

talregev · 2024-12-12T07:42:25Z

I will remove the namespace from this PR, and next version we can add it back.

talregev · 2024-12-12T08:21:01Z

@WangWeiLin-MV The PR is ready for review.

talregev · 2024-12-12T11:15:10Z

requiring patching in port msh3

The change of namespace not effect msh3 repo, because msh3 use msquic as internal lib, and have access to internal targets.
The msh3 here must have to be patch, because we use the msquic as external, and not because of the namespace.

dg0yt

The serious concerns are resolved.
Thanks.

talregev · 2024-12-14T06:51:22Z

@MonicaLiu0311 Can you review my PR?

WangWeiLin-MV

The port usage tests fail with error C1083: Cannot open include file: 'msquic.h': No such file or directory

cmake_minimum_required(VERSION 3.25.1)
project(Proj LANGUAGES CXX)

add_executable(main c.cpp)
target_compile_features(main PRIVATE cxx_std_23)

find_package(msquic CONFIG REQUIRED)
target_link_libraries(main PRIVATE msquic)

talregev · 2024-12-16T08:36:39Z

The port usage tests fail with error C1083: Cannot open include file: 'msquic.h': No such file or directory

cmake_minimum_required(VERSION 3.25.1)
project(Proj LANGUAGES CXX)

add_executable(main c.cpp)
target_compile_features(main PRIVATE cxx_std_23)

find_package(msquic CONFIG REQUIRED)
target_link_libraries(main PRIVATE msquic)

I guess you test msquic.
I am not sure why? It compile with msh3.
What os do you do the test?
It should export all the headers. and on msquic ci, I see it copy the headers on the test.

@dg0yt Can you take a look too?

talregev · 2024-12-16T08:36:54Z

I don't have the knowledge to solve it.

dg0yt · 2024-12-16T08:47:12Z

Did upstream merge the $<INSTALL_INTERFACE:include> lines which are removed from the patch now? IIUC upstream CMake modifications were authored by @talregev.

Put the usage in a test port, and you catch breaking changes early, and you save time.

WangWeiLin-MV · 2024-12-16T08:53:48Z

ports/msquic/fix-install.patch

-     target_include_directories(msquic PUBLIC
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
-        $<INSTALL_INTERFACE:${include_dest}>)
-+        $<INSTALL_INTERFACE:include>)


Test case build pass when manual specify target_include_directories. Probably due to it missing the include path.

these lines is now on one other place:
https://github.com/microsoft/msquic/blob/main/src/inc/CMakeLists.txt#L14

I can patch upstream and wait for it release.

talregev · 2024-12-16T09:15:25Z

@WangWeiLin-MV I added a new patch that export the include to relative folder. Can you test it again?

WangWeiLin-MV · 2024-12-16T10:04:01Z

Test failed on configure steps.

  Targets Defined: msquic, msquic_platform, inc, logging_inc, warnings,
  main_binary_link_args, OpenSSL, OpenSSLQuic

  Targets not yet defined: MsQuicEtw_Header

Please test the case above.

- Update msquic to 3.4.7 - Update msh3 to 0.7.0

talregev · 2024-12-16T11:03:18Z

Test failed on configure steps.

  Targets Defined: msquic, msquic_platform, inc, logging_inc, warnings,
  main_binary_link_args, OpenSSL, OpenSSLQuic

  Targets not yet defined: MsQuicEtw_Header

Please test the case above.

I don't have the cpp file.
Also I change again. Can you test again?

dg0yt

The point is that the interface include dir must be attached to msquic directly (like in the original patch).
All the other targets in msquic are linked as PRIVATE at msquic build-time, i.e. they are LINK_ONLY transitive dependencies for static library linkage, but they do not forward interface include directories to the user who is linking to msquic.

dg0yt · 2024-12-16T15:39:47Z

ports/msquic/relative_export_include.patch

+ target_include_directories(inc INTERFACE 
+     $<BUILD_INTERFACE:${QUIC_INCLUDE_DIR}>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    $<INSTALL_INTERFACE:include>)


This is neither necessary nor useful: inc is a private link lib of msquic.

When I remove the lines in the patch in the upstream, I change this line, because this is the source of the include folder.
microsoft/msquic#4575
This is my attempt to deal with the test fail here: #42547 (comment)
If this is not good change, as you say, please provide the solution.
I don't have enough knowledge to solve it.
If you don't have time to help (that is totally fine), I will close this PR and open an issue to update both msquic and msh3 and when you have time, please take a look on it and update it yourself.

Thank you for your comments and your help. I appreciate your knowledge. 🙏🏻

talregev · 2024-12-16T21:28:53Z

Test failed on configure steps.

  Targets Defined: msquic, msquic_platform, inc, logging_inc, warnings,
  main_binary_link_args, OpenSSL, OpenSSLQuic

  Targets not yet defined: MsQuicEtw_Header

Please test the case above.

@WangWeiLin-MV Can you verify if the new change is working for your test? Thank you.

jimwang118 · 2024-12-17T02:17:30Z

Usage test passed with x64-windows triplet.

jimwang118 · 2024-12-17T08:27:11Z

Usage test passed with x64-windows triplet.

The usage test failed under Linux with the following error.

CMake Error at /mnt/vcpkg/scripts/buildsystems/vcpkg.cmake:859 (_find_package):
  Could not find a package configuration file provided by "msquic" with any
  of the following names:

    msquicConfig.cmake
    msquic-config.cmake

  Add the installation prefix of "msquic" to CMAKE_PREFIX_PATH or set
  "msquic_DIR" to a directory containing one of the above files.  If "msquic"
  provides a separate development package or SDK, be sure it has been
  installed.
Call Stack (most recent call first):
  CMakeLists.txt:14 (find_package)

talregev · 2024-12-17T09:17:59Z

Usage test passed with x64-windows triplet.

The usage test failed under Linux with the following error.

CMake Error at /mnt/vcpkg/scripts/buildsystems/vcpkg.cmake:859 (_find_package):
  Could not find a package configuration file provided by "msquic" with any
  of the following names:

    msquicConfig.cmake
    msquic-config.cmake

  Add the installation prefix of "msquic" to CMAKE_PREFIX_PATH or set
  "msquic_DIR" to a directory containing one of the above files.  If "msquic"
  provides a separate development package or SDK, be sure it has been
  installed.
Call Stack (most recent call first):
  CMakeLists.txt:14 (find_package)

Thank you for your time and effort for review. I don't have the knowledge to solve this issue.
I open a vcpkg issue to update msquic:
#42755

talregev changed the title ~~[msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0~~ [Help needed][msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0 Dec 5, 2024

MonicaLiu0311 assigned WangWeiLin-MV Dec 6, 2024

WangWeiLin-MV added the category:port-update The issue is with a library, which is requesting update new revision label Dec 6, 2024

talregev force-pushed the TalR/msquic_msh3 branch from bad20f3 to dcc56a2 Compare December 10, 2024 21:13

talregev changed the title ~~[Help needed][msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0~~ [msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0 Dec 10, 2024

talregev force-pushed the TalR/msquic_msh3 branch 9 times, most recently from 5f16404 to ef95015 Compare December 11, 2024 06:34

dg0yt mentioned this pull request Dec 11, 2024

[msh3] update to 0.7.0 #42607

Closed

dg0yt reviewed Dec 11, 2024

View reviewed changes

ports/msh3/dependencies_fix.patch Outdated Show resolved Hide resolved

ports/msh3/dependencies_fix.patch Outdated Show resolved Hide resolved

talregev force-pushed the TalR/msquic_msh3 branch 4 times, most recently from d971fbd to ccba8d5 Compare December 11, 2024 12:53

talregev force-pushed the TalR/msquic_msh3 branch from ccba8d5 to 75f7b1a Compare December 12, 2024 06:04

dg0yt suggested changes Dec 12, 2024

View reviewed changes

talregev force-pushed the TalR/msquic_msh3 branch 2 times, most recently from 1d81177 to 65575fa Compare December 12, 2024 08:10

dg0yt approved these changes Dec 13, 2024

View reviewed changes

WangWeiLin-MV requested changes Dec 16, 2024

View reviewed changes

talregev requested a review from dg0yt December 16, 2024 08:37

WangWeiLin-MV reviewed Dec 16, 2024

View reviewed changes

talregev force-pushed the TalR/msquic_msh3 branch from 65575fa to eea0aff Compare December 16, 2024 09:14

WangWeiLin-MV assigned jimwang118 Dec 16, 2024

WangWeiLin-MV self-requested a review December 16, 2024 10:06

Ports:

cef1bd8

- Update msquic to 3.4.7 - Update msh3 to 0.7.0

talregev force-pushed the TalR/msquic_msh3 branch from eea0aff to cef1bd8 Compare December 16, 2024 10:52

dg0yt reviewed Dec 16, 2024

View reviewed changes

jimwang118 added info:reviewed Pull Request changes follow basic guidelines and removed info:reviewed Pull Request changes follow basic guidelines labels Dec 17, 2024

jimwang118 marked this pull request as draft December 17, 2024 08:27

talregev closed this Dec 17, 2024

talregev mentioned this pull request Dec 17, 2024

[msquic] update to 2.4.7 #42755

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0 #42547

[msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0 #42547

talregev commented Dec 5, 2024

talregev commented Dec 5, 2024

BillyONeal commented Dec 5, 2024

talregev commented Dec 5, 2024 •

edited

Loading

talregev commented Dec 5, 2024

BillyONeal commented Dec 6, 2024

talregev commented Dec 11, 2024

talregev commented Dec 12, 2024

dg0yt left a comment

talregev commented Dec 12, 2024

talregev commented Dec 12, 2024

talregev commented Dec 12, 2024

dg0yt left a comment

talregev commented Dec 14, 2024

WangWeiLin-MV left a comment

talregev commented Dec 16, 2024 •

edited

Loading

talregev commented Dec 16, 2024

dg0yt commented Dec 16, 2024

WangWeiLin-MV Dec 16, 2024

talregev Dec 16, 2024

talregev commented Dec 16, 2024

WangWeiLin-MV commented Dec 16, 2024

talregev commented Dec 16, 2024

dg0yt left a comment

dg0yt Dec 16, 2024 •

edited

Loading

talregev Dec 16, 2024 •

edited

Loading

talregev commented Dec 16, 2024

jimwang118 commented Dec 17, 2024

jimwang118 commented Dec 17, 2024

talregev commented Dec 17, 2024

[msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0 #42547

[msquic, msh3] update msquic to 3.4.7, update msh3 to 0.7.0 #42547

Conversation

talregev commented Dec 5, 2024

talregev commented Dec 5, 2024

BillyONeal commented Dec 5, 2024

talregev commented Dec 5, 2024 • edited Loading

talregev commented Dec 5, 2024

BillyONeal commented Dec 6, 2024

talregev commented Dec 11, 2024

talregev commented Dec 12, 2024

dg0yt left a comment

Choose a reason for hiding this comment

talregev commented Dec 12, 2024

talregev commented Dec 12, 2024

talregev commented Dec 12, 2024

dg0yt left a comment

Choose a reason for hiding this comment

talregev commented Dec 14, 2024

WangWeiLin-MV left a comment

Choose a reason for hiding this comment

talregev commented Dec 16, 2024 • edited Loading

talregev commented Dec 16, 2024

dg0yt commented Dec 16, 2024

WangWeiLin-MV Dec 16, 2024

Choose a reason for hiding this comment

talregev Dec 16, 2024

Choose a reason for hiding this comment

talregev commented Dec 16, 2024

WangWeiLin-MV commented Dec 16, 2024

talregev commented Dec 16, 2024

dg0yt left a comment

Choose a reason for hiding this comment

dg0yt Dec 16, 2024 • edited Loading

Choose a reason for hiding this comment

talregev Dec 16, 2024 • edited Loading

Choose a reason for hiding this comment

talregev commented Dec 16, 2024

jimwang118 commented Dec 17, 2024

jimwang118 commented Dec 17, 2024

talregev commented Dec 17, 2024

talregev commented Dec 5, 2024 •

edited

Loading

talregev commented Dec 16, 2024 •

edited

Loading

dg0yt Dec 16, 2024 •

edited

Loading

talregev Dec 16, 2024 •

edited

Loading