Bug: https://bugs.gentoo.org/752147
Signed-off-by: Zac Medico <zmed...@gentoo.org>
---
 lib/portage/package/ebuild/config.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/config.py 
b/lib/portage/package/ebuild/config.py
index a09fdbced..3be8f9f6d 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -401,9 +401,14 @@ class config:
                        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 default 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")
-- 
2.26.2


Reply via email to