| 1 |
commit: f28d32f298d4b089a2e36bebca2a55b6aeabe2a3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 11 13:51:35 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 14 01:29:38 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f28d32f2 |
| 7 |
|
| 8 |
Allow ESYSROOT and BROOT in the pkg_setup phase |
| 9 |
|
| 10 |
This follows a recent change to PMS. |
| 11 |
|
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 14 |
|
| 15 |
lib/portage/package/ebuild/config.py | 7 ++++--- |
| 16 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py |
| 19 |
index 83a15b370..e0dda54d4 100644 |
| 20 |
--- a/lib/portage/package/ebuild/config.py |
| 21 |
+++ b/lib/portage/package/ebuild/config.py |
| 22 |
@@ -2820,12 +2820,13 @@ class config(object): |
| 23 |
if not eapi_exports_merge_type(eapi): |
| 24 |
mydict.pop("MERGE_TYPE", None) |
| 25 |
|
| 26 |
- src_phase = _phase_func_map.get(phase, '').startswith('src_') |
| 27 |
+ src_like_phase = (phase == 'setup' or |
| 28 |
+ _phase_func_map.get(phase, '').startswith('src_')) |
| 29 |
|
| 30 |
- if not (src_phase and eapi_attrs.sysroot): |
| 31 |
+ if not (src_like_phase and eapi_attrs.sysroot): |
| 32 |
mydict.pop("ESYSROOT", None) |
| 33 |
|
| 34 |
- if not (src_phase and eapi_attrs.broot): |
| 35 |
+ if not (src_like_phase and eapi_attrs.broot): |
| 36 |
mydict.pop("BROOT", None) |
| 37 |
|
| 38 |
# Prefix variables are supported beginning with EAPI 3, or when |
Archives