Fix lz4 missing from flann.pc Requires: line.#481
Fix lz4 missing from flann.pc Requires: line.#481nh2 wants to merge 1 commit intoflann-lib:masterfrom
Requires: line.#481Conversation
57ba5cb to
d8eff43
Compare
|
Can you add HDF5's dependency at the same time? |
d8eff43 to
3d0922c
Compare
@longhuan2018 Done. |
|
Can you drop |
3d0922c to
86dd84e
Compare
@jspricke Done. But why does According to https://people.freedesktop.org/~dbn/pkg-config-guide.html, section "Writing pkg-config files",
|
|
@longhuan2018 Should It says
So it sounds like it is only needed for tests, should it then be used for |
flann is exposing lz4 headers in |
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.
Yes, then it is correct. I've added that info as a CMake comment. Then I only need the answer from @longhuan2018 regarding HDF5. |
86dd84e to
910099b
Compare
lz4 is an unconditional dependency of flann (see #399),
but until now was not correctly generated into the
Requires: lz4line offlann.pc,because the
PKG_EXTERNAL_DEPSvariable used inflann.pc.inwas not defined at all.
This fixes build error
lz4.h: No such file or directoryfor properly sandboxed builds, in which undeclared dependencies
are not made available.