Pkgconfig CMake compatibility & switch to pkgconf #693
+13
−13
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
JayFoxRox
reviewed
Jan 10, 2025
| --define-variable=NXDK_DIR=${NXDK_DIR} \ | ||
| --define-prefix \ | ||
| --static \ | ||
| "$@" | ||
| "$@" | sed 's/\.lib\.lib/\.lib/g' |
There was a problem hiding this comment.
I'm not sure I follow the PR description.
I thought the .lib.lib only happens when using --msvc-syntax, but now --msvc-syntax is absent?
(Also, why does it produce .lib.lib? This feels like a bug - was it reported?)
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.
The last two commits are from #631, with only the commit title updated. They make it possible for CMake to find the libraries to link against via pkg-config.
These two commits had the problem that they fix CMake, but by doing so are breaking direct usage of
nxdk-pkg-config(and probably meson) because the emitted linker arguments are inldsyntax, while we rely on the syntax oflink.exe.This PR circumvents this issue by switching from whatever pkg-config the host OS provides to explicitly requiring
pkgconf(which is the defaultpkg-configimplementation on Arch, Alpine and probably others anyway).pkgconfprovides a--msvc-syntaxparameter that can be used to get the requiredlink.exe-style linker parameters. This would add an additional.libsuffix to the library paths (resulting in things likelibjpeg.lib.lib), so I added a smallsedcommand to fix that.