| 1 |
commit: e31c0c929673482101a066541d462d692502a6d1 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 1 20:10:18 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 2 01:30:32 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31c0c92 |
| 7 |
|
| 8 |
make.conf: expand special *ROOT variables (bug 752147) |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/752147 |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
lib/portage/package/ebuild/config.py | 7 ++++++- |
| 14 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py |
| 17 |
index a09fdbced..a188c700d 100644 |
| 18 |
--- a/lib/portage/package/ebuild/config.py |
| 19 |
+++ b/lib/portage/package/ebuild/config.py |
| 20 |
@@ -401,9 +401,14 @@ class config: |
| 21 |
expand_map = env_d.copy() |
| 22 |
self._expand_map = expand_map |
| 23 |
|
| 24 |
- # Allow make.globals to set default paths relative to ${EPREFIX}. |
| 25 |
+ # Allow make.globals and make.conf to set paths relative to vars like ${EPREFIX}. |
| 26 |
+ expand_map["BROOT"] = broot |
| 27 |
expand_map["EPREFIX"] = eprefix |
| 28 |
+ expand_map["EROOT"] = eroot |
| 29 |
+ expand_map["ESYSROOT"] = esysroot |
| 30 |
expand_map["PORTAGE_CONFIGROOT"] = config_root |
| 31 |
+ expand_map["ROOT"] = target_root |
| 32 |
+ expand_map["SYSROOT"] = sysroot |
| 33 |
|
| 34 |
if portage._not_installed: |
| 35 |
make_globals_path = os.path.join(PORTAGE_BASE_PATH, "cnf", "make.globals") |
Archives