make.conf: expand special *ROOT variables (bug 752147)
Bug: https://bugs.gentoo.org/752147
Signed-off-by: Zac Medico <zmedico@gentoo.org>
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index a09fdbc..a188c70 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -401,9 +401,14 @@
expand_map = env_d.copy()
self._expand_map = expand_map
- # Allow make.globals to set default paths relative to ${EPREFIX}.
+ # Allow make.globals and make.conf to set paths relative to vars like ${EPREFIX}.
+ expand_map["BROOT"] = broot
expand_map["EPREFIX"] = eprefix
+ expand_map["EROOT"] = eroot
+ expand_map["ESYSROOT"] = esysroot
expand_map["PORTAGE_CONFIGROOT"] = config_root
+ expand_map["ROOT"] = target_root
+ expand_map["SYSROOT"] = sysroot
if portage._not_installed:
make_globals_path = os.path.join(PORTAGE_BASE_PATH, "cnf", "make.globals")
