lzo: ensure #include <lzo/lzo1x.h> works with pkgconf cflags -I${includedir}/lzo
#44143
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.
Downstream packages from lzo, e.g. squashfuse, use
#include <lzo/lzo1x.h>
, while thelzo2.pc
file containsCflags: -I${includedir}/lzo
(no direct link available). These two are not compatible since it leads to a search forlzo/lzo1x.h
under<prefix>/include/lzo/
where it does not exist.Squashfuse doesn't use pkgconf (it uses a custom m4 macro that returns cppflags ending at include/), but packages using pkgconf will run into problems. An example of a package that picks up lzo through pkgconf is cairo, after transition from autotools to meson, in particular when using environments that pull in lzo (since it is not a direct dependency of cairo, but pkgconfig picks up lzo2.pc through the shared view
<prefix>/lib/pkgconfig
).This PR adds the recursive link
<prefix>/include/lzo/lzo
-><prefix>/include/lzo
to ensure that includes will resolve correctly when meson uses pkgconfig to set cflags.With this PR we get