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 9AF401382C5 for ; Mon, 18 May 2020 19:23:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB14EE087D; Mon, 18 May 2020 19:23:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9C953E087D for ; Mon, 18 May 2020 19:23:38 +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 133DC34E894 for ; Mon, 18 May 2020 19:23:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A6275175 for ; Mon, 18 May 2020 19:23:34 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1589829737.878eddfea083eda5aea60510aa1c4e9145f26b99.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/doebuild.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 878eddfea083eda5aea60510aa1c4e9145f26b99 X-VCS-Branch: master Date: Mon, 18 May 2020 19:23:34 +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: ba09bccf-4a71-4693-ba25-ed0ef0969e56 X-Archives-Hash: d8f38778635c23668e9995b2aa980dc5 commit: 878eddfea083eda5aea60510aa1c4e9145f26b99 Author: Michał Górny gentoo org> AuthorDate: Mon May 18 19:22:17 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon May 18 19:22:17 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=878eddfe Revert "doebuild: Use ccache/distcc/icecream only in src_* phases" This breaks ccache/etc. entirely as they are no longer present in PATH in later phases. Reverts: 61f76236aa10c297f79c2fee123a79d26bfa9327 Signed-off-by: Michał Górny gentoo.org> lib/portage/package/ebuild/doebuild.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 1343eca6d..2bff94cb1 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -486,14 +486,7 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, distcc = "distcc" in mysettings.features icecream = "icecream" in mysettings.features - # run cc thingies only in src_* phases as otherwise they might - # create files with incorrect ownership and trip over - # (NB: install has a similar issue but 1) some badly written - # packages rebuild stuff there, so ccache is very helpful - # and 2) almost always some compilation will happen earlier, - # so permissions will be already set correctly) - if (ccache or distcc or icecream) and mydo in ('unpack', - 'prepare', 'configure', 'test', 'install'): + if ccache or distcc or icecream: libdir = None default_abi = mysettings.get("DEFAULT_ABI") if default_abi: