meson.eclass: wire up pkgconfig variables

meson-0.54.0 introduced a regression in how meson treats the
PKG_CONFIG_PATH variable. Work around this by passing the value to meson
setup on the command line.

Also add sys_root and pkg_config_libdir to cross files per the upstream
documentation.

Bug: https://bugs.gentoo.org/719018
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 81cfa7c38fc6469a5843f23cabe3420c0d6e1833..423a497e840c9caa7ccb91c07696353a2765872a 100644 (file)
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -182,6 +182,8 @@ _meson_create_cross_file() {
        objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
        objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
        needs_exe_wrapper = ${needs_exe_wrapper}
+       sys_root = '${SYSROOT}'
+       pkg_config_libdir = '${PKG_CONFIG_LIBDIR-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
 
        [host_machine]
        system = '${system}'
@@ -232,6 +234,7 @@ meson_src_configure() {
                --prefix "${EPREFIX}/usr"
                --sysconfdir "${EPREFIX}/etc"
                --wrap-mode nodownload
+               --pkg-config-path="${PKG_CONFIG_PATH-${EPREFIX}/usr/share/pkgconfig}"
        )
 
        if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then