| 1 |
commit: 3ac0cf49ca2ec08758e6f25d1081e20d33ccebb1 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 23 15:21:00 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 23 15:28:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac0cf49 |
| 7 |
|
| 8 |
meson.eclass: wire up pkgconfig variables |
| 9 |
|
| 10 |
meson-0.54.0 introduced a regression in how meson treats the |
| 11 |
PKG_CONFIG_PATH variable. Work around this by passing the value to meson |
| 12 |
setup on the command line. |
| 13 |
|
| 14 |
Also add sys_root and pkg_config_libdir to cross files per the upstream |
| 15 |
documentation. |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/719018 |
| 18 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 19 |
|
| 20 |
eclass/meson.eclass | 3 +++ |
| 21 |
1 file changed, 3 insertions(+) |
| 22 |
|
| 23 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 24 |
index 81cfa7c38fc..423a497e840 100644 |
| 25 |
--- a/eclass/meson.eclass |
| 26 |
+++ b/eclass/meson.eclass |
| 27 |
@@ -182,6 +182,8 @@ _meson_create_cross_file() { |
| 28 |
objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}") |
| 29 |
objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}") |
| 30 |
needs_exe_wrapper = ${needs_exe_wrapper} |
| 31 |
+ sys_root = '${SYSROOT}' |
| 32 |
+ pkg_config_libdir = '${PKG_CONFIG_LIBDIR-${EPREFIX}/usr/$(get_libdir)/pkgconfig}' |
| 33 |
|
| 34 |
[host_machine] |
| 35 |
system = '${system}' |
| 36 |
@@ -232,6 +234,7 @@ meson_src_configure() { |
| 37 |
--prefix "${EPREFIX}/usr" |
| 38 |
--sysconfdir "${EPREFIX}/etc" |
| 39 |
--wrap-mode nodownload |
| 40 |
+ --pkg-config-path="${PKG_CONFIG_PATH-${EPREFIX}/usr/share/pkgconfig}" |
| 41 |
) |
| 42 |
|
| 43 |
if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then |
Archives