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

build: fix pkgconfig files #1913

Merged
merged 1 commit into from
Oct 15, 2024
Merged

build: fix pkgconfig files #1913

merged 1 commit into from
Oct 15, 2024

Conversation

theoparis
Copy link
Contributor

Description of changes:

Currently the pkgconfig files are broken when aws-lc is built with Nix.

See https://github.com/jtojnar/cmake-snips?tab=readme-ov-file#concatenating-paths-when-building-pkg-config-files, and the PR made to libfmt fmtlib/fmt#1657

Call-outs:

I'm not sure if bumping the minimum required CMake version is preferred. The alternative would be to add https://github.com/jtojnar/cmake-snips/blob/master/CMakeScripts/JoinPaths.cmake to the cmake/ directory in the repository. However, most linux distributions have at least CMake 3.20, if not 3.25 so I don't see why this would be a problem.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@theoparis theoparis requested a review from a team as a code owner October 9, 2024 19:02
CMakeLists.txt Outdated Show resolved Hide resolved
# This module provides function for joining paths
# known from most languages
#
# SPDX-License-Identifier: (MIT OR CC0-1.0)
Copy link
Contributor

Choose a reason for hiding this comment

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

A note for reference: Here's a link to the CC0-1.0 license: https://creativecommons.org/publicdomain/zero/1.0/

cmake/JoinPaths.cmake Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Oct 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.50%. Comparing base (49215e8) to head (1773266).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1913   +/-   ##
=======================================
  Coverage   78.50%   78.50%           
=======================================
  Files         585      585           
  Lines       99681    99681           
  Branches    14265    14273    +8     
=======================================
+ Hits        78257    78258    +1     
  Misses      20788    20788           
+ Partials      636      635    -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@justsmth
Copy link
Contributor

Hello @theoparis -- thanks for the PR!

Is there an easy way to test this in our CI, so we can avoid a regression in the future?

@theoparis
Copy link
Contributor Author

theoparis commented Oct 10, 2024

Hmm, I'm not sure what the best way of testing this kind of change would be. I made a Nix derivation here. Maybe it could be tested via a Nix github action? Nix is what reported the broken pkg-config paths.

@justsmth justsmth merged commit f146851 into aws:main Oct 15, 2024
113 of 115 checks passed
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.

4 participants