Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.4] meson: Add option to override system WolfSSL with embedded WolfSSL #1175

Merged
1 commit merged into from
Jul 1, 2024

Conversation

ghost
Copy link

@ghost ghost commented Jun 30, 2024

No description provided.

@ghost ghost self-assigned this Jun 30, 2024
@ghost ghost marked this pull request as ready for review June 30, 2024 09:42
@ghost ghost requested a review from rdmark as a code owner June 30, 2024 09:42
@@ -548,6 +548,7 @@ message('BDB version: ', bdb_version)
#

have_embedded_ssl = get_option('with-embedded-ssl')
force_embedded_ssl = get_option('with-ssl-override')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry if I'm overlooking an obvious constraint, but can't with-embedded-ssl be used as the "forcing" option?

Or conversely, is there a reason to keep with-embedded-ssl when introducing with-ssl-override?

Copy link
Author

@ghost ghost Jun 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with-embedded-ssl is enabled by default. If a correctly configured wolfssl package is detected then with-embedded-ssl has to be disabled to prevent linking issues. So if we wish to override native wolfssl we have to have a separate option which overrides both...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think get it now. The with-embedded-ssl option effectively functions as a flag for whether a functional system library was found or not.

meson_options.txt Outdated Show resolved Hide resolved
@rdmark rdmark changed the title meson: Add option to override system WolfSSL with embedded WolfSSL [2.4] meson: Add option to override system WolfSSL with embedded WolfSSL Jul 1, 2024
@ghost ghost force-pushed the dgsga-wssl-override branch from bfce06e to b6620f6 Compare July 1, 2024 07:15
@ghost ghost merged commit e2c9e1a into branch-netatalk-2-4 Jul 1, 2024
14 checks passed
@ghost ghost deleted the dgsga-wssl-override branch July 1, 2024 07:16
Copy link

sonarqubecloud bot commented Jul 1, 2024

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant