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>
This commit is contained in:
Mike Gilbert
2020-04-23 11:28:10 -04:00
parent 0178c080bc
commit 3ac0cf49ca
+3
View File
@@ -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