Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 03 May 2020 20:44:55
Message-Id: 1588538621.e569e669447a74c2269a0d0f86f53af70fe19284.floppym@gentoo
1 commit: e569e669447a74c2269a0d0f86f53af70fe19284
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 3 20:43:41 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun May 3 20:43:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e569e669
7
8 meson.eclass: ignore PKG_CONFIG_PATH due to Portage bug
9
10 Bug: https://bugs.gentoo.org/720866
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 eclass/meson.eclass | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/meson.eclass b/eclass/meson.eclass
17 index 2d2685ca72a..0dfdcdd03d6 100644
18 --- a/eclass/meson.eclass
19 +++ b/eclass/meson.eclass
20 @@ -323,8 +323,8 @@ meson_src_configure() {
21 --prefix "${EPREFIX}/usr"
22 --sysconfdir "${EPREFIX}/etc"
23 --wrap-mode nodownload
24 - --build.pkg-config-path "${BUILD_PKG_CONFIG_PATH:-${EPREFIX}/usr/share/pkgconfig}"
25 - --pkg-config-path "${PKG_CONFIG_PATH:-${EPREFIX}/usr/share/pkgconfig}"
26 + --build.pkg-config-path "${EPREFIX}/usr/share/pkgconfig"
27 + --pkg-config-path "${EPREFIX}/usr/share/pkgconfig"
28 --native-file "$(_meson_create_native_file)"
29 )