Use build system libdir #95
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
dcbaker
force-pushed
the
submit/use-buildsystem-libdir
branch
3 times, most recently
from
8fabede to
b49d567
Compare
dcbaker
force-pushed
the
submit/use-buildsystem-libdir
branch
2 times, most recently
from
d5462dd to
8cbcfc8
Compare
|
Ah, I'm kinda surprised pixi is the only thing catch that bug. I'll send out a v2 later to fix that. |
dcbaker
force-pushed
the
submit/use-buildsystem-libdir
branch
from
8cbcfc8 to
4f9d3b1
Compare
dcbaker
force-pushed
the
submit/use-buildsystem-libdir
branch
from
4f9d3b1 to
25313c6
Compare
dcbaker
force-pushed
the
submit/use-buildsystem-libdir
branch
2 times, most recently
from
ea3c971 to
0e8913d
Compare
|
The remaining test failure is really annoying, because it only exists in our test configuration, since we have hardcoded paths, but those paths need to depend on the configured libdir. |
This was missed for the ` result:` key
It matches the cmake, and cleans up the root a bit.
dcbaker
force-pushed
the
submit/use-buildsystem-libdir
branch
2 times, most recently
from
d90ed29 to
101682d
Compare
Our build systems know what the libdir and datadir that will be used is, and we should honor that. The actual code changes here aren't too complicated, but the test system actually needs a good deal of enhancement to be able to test this correctly.
…refix
There are two corrections here:
1) only remove one, either the datadir or the libdir
2) only remove the directory if the whole directory can be removed, for
example: the prefix is `/usr/lib/foo/x86_64-linux-gnu`, and the libdir
is `lib/x86_64-linux-gnu`, we don't want to take off just the
`x86_64-linux-gnu`, we want to leave the whole thing since we
couldn't remove the entire libdir.
dcbaker
force-pushed
the
submit/use-buildsystem-libdir
branch
from
101682d to
b51954d
Compare
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
|
I hid my own comment as I checked PR 94 instead of PR 95 and the issue I found is unrelated. This branch builds and tests just fine. |
tylerjw
approved these changes
Sep 24, 2024
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.
Instead of hardcoding it.
This required some enhancements to our test system, and that we generate tests that need to use
@prefix@, since the{lib}component depends on how the build is configured. I've also done some work to make the handling of the libdir and the datadir more robust (ie, only remove one, fail if we can't remove all components).This does, I noticed, use
datadirinstead of harding codingshareas the datadir path. That might not actually be desirable.Based on #93Based on #102