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

Fix libdir value in liboqs.pc #1496

Merged
merged 1 commit into from
Jun 11, 2023
Merged

Conversation

vt-alt
Copy link
Contributor

@vt-alt vt-alt commented Jun 11, 2023

Libdir is not always '/usr/lib' and its value is different between distributions and architectures. Set it from CMAKE_INSTALL_LIBDIR. Also, set includedir in a similar way.

Currently, this incorrect setting did not produce incorrect output by pkg-config --libs because pkg-config strips 'system library paths' form the output. But in non-standard build environments this may cause incorrect linking.

Issue: #1495

  • 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 oqs-provider, OQS-OpenSSL, OQS-BoringSSL, and OQS-OpenSSH will also need to be ready for review and merge by the time this is merged.)

Libdir is not always '/usr/lib' and its value is different between
distributions and architectures. Set it from CMAKE_INSTALL_LIBDIR.
Also, set includedir in a similar way.

Currently, this incorrect setting did not produce incorrect output by
pkg-config --libs because pkg-config strips 'system library paths' form
the output. But in non-standard build environments this may cause
incorrect linking.

Issue: open-quantum-safe#1495
Signed-off-by: Vitaly Chikunov <[email protected]>
@vt-alt vt-alt requested review from dstebila and xvzcf as code owners June 11, 2023 16:05
@vt-alt
Copy link
Contributor Author

vt-alt commented Jun 11, 2023

I tested on ALT and Debian and new values appear to me correct.
Debian builds with cmake setting -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu and on ALT with default setting (determined by cmake).

@dstebila dstebila merged commit f0e6b86 into open-quantum-safe:main Jun 11, 2023
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