Use string(JOIN) to avoid semicolons in pc file. #480
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
nh2
added a commit
to nh2/flann
that referenced
this pull request
Sep 26, 2023
lz4 is an unconditional dependency of flann (see flann-lib#399), but until now was not correctly generated into the `Requires: lz4` line of `flann.pc`, because the `PKG_EXTERNAL_DEPS` variable used in `flann.pc.in` was not defined at all. This fixes build error `lz4.h: No such file or directory` for properly sandboxed builds, in which undeclared dependencies are not made available. Same thing for HDF5, but conditionally. For lz4, also remove the hardcode of `@LZ4_STATIC_LDFLAGS@` from `flann.pc.in`, as this is no longer necessary. That fixes an incorrect `-L` flag being generated in there, e.g. `-L/usr/lib;-llz4`. Thus fixes flann-lib#480.
nh2
added a commit
to nh2/flann
that referenced
this pull request
Sep 27, 2023
lz4 is an unconditional dependency of flann (see flann-lib#399), but until now was not correctly generated into the `Requires: lz4` line of `flann.pc`, because the `PKG_EXTERNAL_DEPS` variable used in `flann.pc.in` was not defined at all. This fixes build error `lz4.h: No such file or directory` for properly sandboxed builds, in which undeclared dependencies are not made available. Same thing for HDF5, but conditionally. For lz4, also remove the hardcode of `@LZ4_STATIC_LDFLAGS@` from `flann.pc.in`, as this is no longer necessary. That fixes an incorrect `-L` flag being generated in there, e.g. `-L/usr/lib;-llz4`. Thus fixes flann-lib#480.
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.
An issue was encountered (NixOS/nixpkgs#129491) when updating the Nix package for FLANN, where a list-separating semicolon was making it into the pkgconfig file:
This semicolon breaks the flag parsing logic in the linker and needs to be filtered out, either with a string replacement or by doing a string(JOIN) as in this PR, for which CMake 3.12 is required. Note that 3.12 was released in July 2018, so this change would break a user building
masterfrom source on Ubuntu 18.04, but is fine on 20.04 or anything newer than that.This should go in after #369; that change is being patched into Debian, Nix, Homebrew, buildroot, and probably elsewhere.
FYI @jspricke