Clean up some FreeBSD conditions #98
Merged
Conversation
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
Change build_machine to host_machine for freebsd specific configuration.
Allow building the test on a FreeBSD build host even if no "OpenSSL" since the base OpenSSL will suffice.
OPENSSL_init_ssl only exists since version 1.1.0.
Dependency on libcrypto neither necessary nor desirable if using the builtin openssl (it world require the ports version to be installed instead.)
Collaborator
|
Hello @hdholm. Thanks for PR. Changes LGTM. Please, could you rebase on top of the current tree to fix the conflicts? Thanks in advance |
sarroutbi
approved these changes
Oct 6, 2021
Signed-off-by: Sergio Arroutbi Braojos <sarroutb@redhat.com>
Depend on host_machine rather than build_machine to account for potential cross compilation.
Look for the openSSL libs in /usr/local first.
Fix for OpenSSL 3
ngie-eign
reviewed
May 7, 2023
ngie-eign
reviewed
May 7, 2023
ngie-eign
reviewed
May 7, 2023
ngie-eign
left a comment
ngie-eign
left a comment
There was a problem hiding this comment.
Just some comments -- thank you for pushing this :).
Whatever in meson/FreeBSD was unhappy about the basic library dependency for libcrypto seems to have been fixed because it's working for me in all tests I've done in it's basic form. Also removing the version check since nothing should be using the wildly out of date openssl.
Contributor
Author
|
The CI checks are stalled on this, which I believe is fixed by PR #129 |
eli-schwartz
suggested changes
May 12, 2023
…private change is the right answer. I did not make changes to the depends method(s) since that seemed to make the Debian based builds very unhappy (couldn't find libcrypto) and everything else seems to generate reasonable pkg_config files without invoking method.
Collaborator
|
Hello @hdholm. Thanks for the PR. A new release of jose is being planned and we would like this change to be merged ... would you mind fixing the conflicts? Or do you prefer me to do it? I am OK with both. |
Collaborator
|
As conflict is easily fixable, I will sort it out myself. Thanks for your PR @hdholm. |
sergio-correia
approved these changes
Feb 2, 2024
Signed-off-by: Sergio Arroutbi <sarroutb@redhat.com>
Contributor
Author
|
Thanks for taking care of it. It's been a very busy week. Just catching up on email now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Relatively small changes to check for host_machine vs. build_machine as the target to account for possible cross compilation. Additionally removes some explicit dependencies on OpenSSL for FreeBSD which required OpenSSL to be installed via pkg or ports rather than relying on the "built-in" OpenSSL version shipped by default. Consequently discovered that the issue-75 test depends on version 1.1.0 or higher of OpenSSL being installed on the build machine for OPENSSL_init_ssl, .so made that explicit in the dependency.