Skip to content

Various fixes for how we interact with subproject dependencies

Nirbheek Chauhan requested to merge nirbheek/meson-subproject-usage-fixes into main

Replaces !3172 (closed).

meson: Don't accidentally pick up pcre2 fallback in the first test

This test assumes that pcre2 is not provided by a subproject, so force
it to be that. Explicitly allow fallback in the next check (although
it's implied already).
meson: Don't use outdated 'fallback:' kwarg to dependency()

The mapping is done using the wrap file now. Also update the libffi
and pcre2 subprojects at the same time.
meson: Fix pcre static flag usage with a subproject

meson: Don't accidentally pick up intl fallback in the first test

If proxy-libintl has already been configured before we get to glib, we
will pick that up in dependency('intl'), which then does compiler
checks on it. This was written to assume that the first check will not
find a subproject for libintl, so force it with allow_fallback: false.

Also update the proxy-libintl wrap file and get rid of the explicit
subproject() call.

Merge request reports