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 DFED4138334 for ; Sun, 11 Aug 2019 13:52:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 250E0E086C; Sun, 11 Aug 2019 13:52:02 +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 04D42E086C for ; Sun, 11 Aug 2019 13:52:02 +0000 (UTC) Received: from symphony.aura-online.co.uk (154.189.187.81.in-addr.arpa [81.187.189.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: chewi) by smtp.gentoo.org (Postfix) with ESMTPSA id EE05C3498E4; Sun, 11 Aug 2019 13:51:59 +0000 (UTC) From: James Le Cuirot To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= , James Le Cuirot Subject: [gentoo-portage-dev] [PATCH] Allow ESYSROOT and BROOT in the pkg_setup phase Date: Sun, 11 Aug 2019 14:51:35 +0100 Message-Id: <20190811135134.28917-1-chewi@gentoo.org> X-Mailer: git-send-email 2.21.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 330c08ad-c61b-4d65-b470-ed45abe36b74 X-Archives-Hash: 7b13afd8a24f2b33513246f3ef1e7b19 From: Michał Górny This follows a recent change to PMS. Signed-off-by: James Le Cuirot --- lib/portage/package/ebuild/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) Sending this on behalf of mgorny as requested. diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py index 83a15b370..e0dda54d4 100644 --- a/lib/portage/package/ebuild/config.py +++ b/lib/portage/package/ebuild/config.py @@ -2820,12 +2820,13 @@ class config(object): if not eapi_exports_merge_type(eapi): mydict.pop("MERGE_TYPE", None) - src_phase = _phase_func_map.get(phase, '').startswith('src_') + src_like_phase = (phase == 'setup' or + _phase_func_map.get(phase, '').startswith('src_')) - if not (src_phase and eapi_attrs.sysroot): + if not (src_like_phase and eapi_attrs.sysroot): mydict.pop("ESYSROOT", None) - if not (src_phase and eapi_attrs.broot): + if not (src_like_phase and eapi_attrs.broot): mydict.pop("BROOT", None) # Prefix variables are supported beginning with EAPI 3, or when -- 2.21.0