public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Zac Medico <zmedico@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Cc: Zac Medico <zmedico@gentoo.org>
Subject: [gentoo-portage-dev] [PATCH] make.conf: expand special *ROOT variables (bug 752147)
Date: Sun,  1 Nov 2020 12:30:15 -0800	[thread overview]
Message-ID: <20201101203015.577402-1-zmedico@gentoo.org> (raw)

Bug: https://bugs.gentoo.org/752147
Signed-off-by: Zac Medico <zmedico@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	other threads:[~2020-11-01 20:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201101203015.577402-1-zmedico@gentoo.org \
    --to=zmedico@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox