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

Don't hardcode OPENSSL_ROOT_DIR to /usr on Linux #1873

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Conversation

SWilson4
Copy link
Member

Recent versions of CMake search only OPENSSL_ROOT_DIR if defined, so if OpenSSL is installed in a location other than /usr (e.g., /usr/lib/x86_64-linux-gnu), the build will fail.

Fixes #1748.

  • Does this PR change the input/output behaviour of a cryptographic algorithm (i.e., does it change known answer test values)? (If so, a version bump will be required from x.y.z to x.(y+1).0.)
  • Does this PR change the list of algorithms available -- either adding, removing, or renaming? Does this PR otherwise change an API? (If so, PRs in fully supported downstream projects dependent on these, i.e., oqs-provider will also need to be ready for review and merge by the time this is merged.)

Copy link
Member

@baentsch baentsch left a comment

Choose a reason for hiding this comment

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

Thanks for this improvement @SWilson4 . Conceptually LGTM. Don't understand why we did this hardcoding. As this was 4 years ago, most likely no negative impact to downstreams, but a "trigger-downstream" tag would be good, no?

Signed-off-by: Spencer Wilson <[email protected]>
@SWilson4
Copy link
Member Author

Thanks for this improvement @SWilson4 . Conceptually LGTM. Don't understand why we did this hardcoding. As this was 4 years ago, most likely no negative impact to downstreams, but a "trigger-downstream" tag would be good, no?

It never hurts :)

@SWilson4
Copy link
Member Author

SWilson4 commented Aug 9, 2024

Pinging @open-quantum-safe/liboqs-committers for a second review here.

@SWilson4
Copy link
Member Author

SWilson4 commented Aug 9, 2024

Given that the Travis tests passed on this branch previously, and the only commit since then is the empty downstream trigger, I think it's safe to say this change will not break Travis whenever that CI system is working again (created #1888 to track). Hence I will go ahead and merge.

@SWilson4 SWilson4 merged commit 4f8c9e2 into main Aug 9, 2024
121 of 122 checks passed
@SWilson4 SWilson4 deleted the sw-cmake-3.28 branch August 9, 2024 17:14
@SWilson4 SWilson4 mentioned this pull request Dec 6, 2024
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.

LibOQS CMake fails with cmake 3.28.3
3 participants