From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 988B5138350 for ; Sun, 3 May 2020 21:42:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 874A4E097D; Sun, 3 May 2020 21:42:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B4CDE097D for ; Sun, 3 May 2020 21:42:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1B6B34F532 for ; Sun, 3 May 2020 21:42:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 369071C8 for ; Sun, 3 May 2020 21:42:07 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1588541893.e2df750e074a54f85aa4f2c109fe8ceea2b9359a.floppym@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e2df750e074a54f85aa4f2c109fe8ceea2b9359a X-VCS-Branch: master Date: Sun, 3 May 2020 21:42:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 224be8df-c298-42e8-a099-e89e974539a3 X-Archives-Hash: 655cb48f2d0e90ea42d233a624c26f14 commit: e2df750e074a54f85aa4f2c109fe8ceea2b9359a Author: Mike Gilbert gentoo org> AuthorDate: Sun May 3 21:28:44 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun May 3 21:38:13 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2df750e phase-functions.sh: do not set PKG_CONFIG_PATH Recent pkg-config should have the correct path built in by default. Bug: https://bugs.gentoo.org/720866 Signed-off-by: Mike Gilbert gentoo.org> Reviewed-by: Zac Medico gentoo.org> bin/phase-functions.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 709fd7527..90e622e75 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -1019,10 +1019,6 @@ __ebuild_main() { [[ ${SANDBOX_WRITE/$DISTCC_DIR} = $SANDBOX_WRITE ]] && \ addwrite "$DISTCC_DIR" - x=LIBDIR_$ABI - [ -z "$PKG_CONFIG_PATH" -a -n "$ABI" -a -n "${!x}" ] && \ - export PKG_CONFIG_PATH=${EPREFIX}/usr/${!x}/pkgconfig - if has noauto $FEATURES && \ [[ ! -f $PORTAGE_BUILDDIR/.unpacked ]] ; then echo