diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-04-23 11:21:00 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-04-23 11:28:10 -0400 |
| commit | 3ac0cf49ca2ec08758e6f25d1081e20d33ccebb1 (patch) | |
| tree | ec9396d98e3435ae0ceed2b09752da3bef530346 /eclass | |
| parent | net-wireless/kismet: bump (diff) | |
| download | gentoo-3ac0cf49ca2ec08758e6f25d1081e20d33ccebb1.tar.gz gentoo-3ac0cf49ca2ec08758e6f25d1081e20d33ccebb1.tar.bz2 gentoo-3ac0cf49ca2ec08758e6f25d1081e20d33ccebb1.zip | |
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>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/meson.eclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 81cfa7c38fc6..423a497e840c 100644 --- 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 |