[openssl-windows] [ffmpeg] [xeus] wrap FindOpenSSL to ensure crypt32 and ws2_32 are added to libraries to be statically linked#14309
Closed
mcmtroffaes wants to merge 3 commits intomicrosoft:masterfrom
Conversation
…dded to libraries to be linked
…L script (fixes linux openssl linking)
Contributor
that is not me wrapper is also contained in #14308 |
Contributor
Author
|
Yes, I literally just noticed. I'll wait until your PR is merged and then see what's still needed here. And apologies for confusing identities! |
JackBoosY
added
category:port-feature
Contributor
Author
|
Now #14308 has been merged, I'll close this and post separate pull requests for xeus and ffmpeg since these parts are completely independent. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does your PR fix? Fixes static linking of OpenSSL on windows. This issue is reported upstream here https://gitlab.kitware.com/cmake/cmake/-/issues/19263 with patch here https://cmake.org/pipermail/cmake-developers/2016-August/029210.html submitted by @Neumann-A back in 2016. Also updates ffmpeg to use OPENSSL_LIBRARIES (coincidentally this also fixes ffmpeg[openssl] linking on x64-linux, and simplifies the FindFFMPEG script). Finally, removes static linking patch on xeus since the wrapper now takes care of it. Both ffmpeg[openssl] and xeus tested on x64-windows-static. The intention is that once upstream cmake fixes FindOpenSSL, the wrapper can be dropped.
Which triplets are supported/not supported? Have you updated the CI baseline? No changes.
Does your PR follow the maintainer guide? To the best of my knowledge, yes.