Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Sun, 03 May 2020 21:42:11
Message-Id: 1588541893.e2df750e074a54f85aa4f2c109fe8ceea2b9359a.floppym@gentoo
1 commit: e2df750e074a54f85aa4f2c109fe8ceea2b9359a
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 3 21:28:44 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun May 3 21:38:13 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2df750e
7
8 phase-functions.sh: do not set PKG_CONFIG_PATH
9
10 Recent pkg-config should have the correct path built in by default.
11
12 Bug: https://bugs.gentoo.org/720866
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14 Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 bin/phase-functions.sh | 4 ----
17 1 file changed, 4 deletions(-)
18
19 diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
20 index 709fd7527..90e622e75 100644
21 --- a/bin/phase-functions.sh
22 +++ b/bin/phase-functions.sh
23 @@ -1019,10 +1019,6 @@ __ebuild_main() {
24 [[ ${SANDBOX_WRITE/$DISTCC_DIR} = $SANDBOX_WRITE ]] && \
25 addwrite "$DISTCC_DIR"
26
27 - x=LIBDIR_$ABI
28 - [ -z "$PKG_CONFIG_PATH" -a -n "$ABI" -a -n "${!x}" ] && \
29 - export PKG_CONFIG_PATH=${EPREFIX}/usr/${!x}/pkgconfig
30 -
31 if has noauto $FEATURES && \
32 [[ ! -f $PORTAGE_BUILDDIR/.unpacked ]] ; then
33 echo