Fix handling of OpenSSL linking on macOS #17535
Merged
Conversation
This file contains 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
Ferroin
changed the title
Ferroin
force-pushed
the
macos-ssl-ci-fix
branch
2 times, most recently
from
d3984e9
to
8d4be59
Compare
Ferroin
force-pushed
the
macos-ssl-ci-fix
branch
2 times, most recently
from
53ad3f5
to
feab040
Compare
thiagoftsm
previously approved these changes
May 7, 2024
|
Rebased to resolve merge conflicts. |
thiagoftsm
reviewed
May 16, 2024
|
Rebased to pick up the latest changes in master. |
Ferroin
force-pushed
the
macos-ssl-ci-fix
branch
2 times, most recently
from
09ec009
to
ac554fd
Compare
|
Rebased to resolve merge conflicts. |
Instead of only pulling in a basic set.
It happened to be working before without this because we weren’t hitting any edge cases, but the use of IMPORTED targets with PkgConfig requires these fixes to behave correctly for transitive dependencies in static builds.
If we fail to find libcrypto when we found openssl with pkg_check_modules, then the openssl install is horribly broken and we will see failures either at link time or at runtime, so there is no point in not checking for it on macOS. This also more clearly delineates that we _do_ require libcrypto irrespective of the platform.
thiagoftsm
approved these changes
May 20, 2024
lechgu
pushed a commit
to SaladTechnologies/netdata
that referenced
this pull request
May 23, 2024
* Pull in all dependencies for macOS CI jobs. Instead of only pulling in a basic set. * Switch to using imported target for OpenSSL in most cases. * Use imported libraries for OpenSSL in all cases. * Work around broken behavior in FindPkgConfig with static builds. It happened to be working before without this because we weren’t hitting any edge cases, but the use of IMPORTED targets with PkgConfig requires these fixes to behave correctly for transitive dependencies in static builds. * Correctly detect static builds. * Fix H2O linking. * Fix typo. * Always check for libcrypto if we found openssl. If we fail to find libcrypto when we found openssl with pkg_check_modules, then the openssl install is horribly broken and we will see failures either at link time or at runtime, so there is no point in not checking for it on macOS. This also more clearly delineates that we _do_ require libcrypto irrespective of the platform.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Test Plan
CI passes on this PR.