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

PS-9151: Fix build with WITH_SSL=openssl11 [trunk] #5264

Merged
merged 2 commits into from
Mar 25, 2024

Conversation

oleksandr-kachan
Copy link
Contributor

@oleksandr-kachan oleksandr-kachan commented Mar 19, 2024

https://perconadev.atlassian.net/browse/PS-9151

Adding some missing parts in cmake files:

  • Remove find_package(OpenSSL REQUIRED) in opensslpp/CMakeLists.txt.
    All openssl related preparations are done inside ssl.cmake.
  • Unset WITH_PERCONA_AUTHENTICATION_FIDO in case the server is being
    built with openssl version incompatible with fido2 lib.
  • Use ext::curl interface library in keyring_vault and keyring_kms cmake.

https://perconadev.atlassian.net/browse/PS-9151

The opensslpp build fails with "Could NOT find OpenSSL" error in case
WITH_SSL=openssl11 is used.
The authentication_fido plugin build fails because of unmet fido2
dependencie.

To fix the issue:
- Remove find_package(OpenSSL REQUIRED) in opensslpp/CMakeLists.txt.
  All openssl related preparations are done inside ssl.cmake.
- Update ssl.cmake to always create OpenSSL::SSL and OpenSSL::Crypto
  imported libs. For all possible WITH_SSL values: system, openssl11,
  /path/to/openssl.
- Unset WITH_PERCONA_AUTHENTICATION_FIDO in case the server is being
  built with openssl version incompatible with fido2 lib.
- Added missing WITH_PERCONA_AUTHENTICATION_FIDO in conditions related
  to fido2 lib handling.
- Use ext::curl interface library in keyring_vault and keyring_kms
  cmake.
@oleksandr-kachan oleksandr-kachan changed the title PS-9151: Remove find_package for openssl in opensslpp/CMakeLists.txt [trunk] PS-9151: Fix build with WITH_SSL=openssl11 [trunk] Mar 22, 2024
@oleksandr-kachan
Copy link
Contributor Author

Copy link
Collaborator

@percona-ysorokin percona-ysorokin left a comment

Choose a reason for hiding this comment

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

LGTM

@oleksandr-kachan oleksandr-kachan merged commit 07fe227 into percona:trunk Mar 25, 2024
7 of 22 checks passed
@oleksandr-kachan oleksandr-kachan deleted the PS-9151-trunk branch March 25, 2024 11:14
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.

2 participants