commit: e31c0c929673482101a066541d462d692502a6d1 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Nov 1 20:10:18 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Nov 2 01:30:32 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31c0c92
make.conf: expand special *ROOT variables (bug 752147) Bug: https://bugs.gentoo.org/752147 Signed-off-by: Zac Medico <zmedico <AT> 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..a188c700d 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 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")
