Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] make.conf: expand special *ROOT variables (bug 752147)
Date: Sun, 01 Nov 2020 20:32:55
Message-Id: 20201101203015.577402-1-zmedico@gentoo.org
1 Bug: https://bugs.gentoo.org/752147
2 Signed-off-by: Zac Medico <zmedico@g.o>
3 ---
4 lib/portage/package/ebuild/config.py | 7 ++++++-
5 1 file changed, 6 insertions(+), 1 deletion(-)
6
7 diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
8 index a09fdbced..3be8f9f6d 100644
9 --- a/lib/portage/package/ebuild/config.py
10 +++ b/lib/portage/package/ebuild/config.py
11 @@ -401,9 +401,14 @@ class config:
12 expand_map = env_d.copy()
13 self._expand_map = expand_map
14
15 - # Allow make.globals to set default paths relative to ${EPREFIX}.
16 + # Allow make.globals and make.conf to set default paths relative to vars like ${EPREFIX}.
17 + expand_map["BROOT"] = broot
18 expand_map["EPREFIX"] = eprefix
19 + expand_map["EROOT"] = eroot
20 + expand_map["ESYSROOT"] = esysroot
21 expand_map["PORTAGE_CONFIGROOT"] = config_root
22 + expand_map["ROOT"] = target_root
23 + expand_map["SYSROOT"] = sysroot
24
25 if portage._not_installed:
26 make_globals_path = os.path.join(PORTAGE_BASE_PATH, "cnf", "make.globals")
27 --
28 2.26.2