ci: revert cargo-c pin, set libdir explicitly #436
Merged
Conversation
This file contains 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
This reverts commit 51f7cbf.
With cargo-c 0.10.0+ there are per-platform/system heuristics being used to generate the libdir that best fits the target system. For the purposes of our CI job we'd prefer to use a consistent/simple directory structure so that we can set the PKG_CONFIG_PATH and LD_LIBRARY_PATH env vars consistently across Ubuntu and MacOS.
ctz
approved these changes
Jun 19, 2024
| run: make --file=Makefile.pkg-config PREFIX=${PREFIX} install | ||
| # NOTE: We set --libdir explicitly to avoid per-system/distro path components | ||
| # that will complicate setting PKG_CONFIG_PATH/LD_LIBRARY_PATH. | ||
| run: > |
There was a problem hiding this comment.
Yeah, gotta "love" YAML....
> is "folded" style and will collapse \n into , whereas | will keep the \n's. We want the former in this case so the CARGOFLAGS env var and the command are the same line, as opposed to the usage on L52 where we want two separate lines (one for curl and one for unzip).
I always end up ref'ing https://yaml-multiline.info/ for this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This undoes (#435) (but leaves the
pkg-config --versionprint).The root cause of the behaviour change is now better understood and documented upstream in the changelog (lu-zero/cargo-c#380). We take the recommendation documented there and set
--libdirexplicitly so our CI job can continue to treat Ubuntu/MacOS the same w.r.tPKG_CONFIG_PATHandLD_LIBRARY_PATH.