From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 631041382C5 for ; Thu, 17 Jun 2021 06:27:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5C89E081E; Thu, 17 Jun 2021 06:27:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99C69E081E for ; Thu, 17 Jun 2021 06:27:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC62E33D7EF for ; Thu, 17 Jun 2021 06:27:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4748E7A1 for ; Thu, 17 Jun 2021 06:27:22 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1623911210.855622160f515a4d4208ccabecae54c00a5b42cf.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 855622160f515a4d4208ccabecae54c00a5b42cf X-VCS-Branch: master Date: Thu, 17 Jun 2021 06:27:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2bfe89d1-e7dd-4fa5-87b7-b04d61018040 X-Archives-Hash: 106257f5a77c3a26e472d5858f526dc0 commit: 855622160f515a4d4208ccabecae54c00a5b42cf Author: Fabian Groffen gentoo org> AuthorDate: Thu Jun 17 06:26:50 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jun 17 06:26:50 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=85562216 qmerge: define BROOT, SYSROOT and ESYSROOT for phase running Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qmerge.c b/qmerge.c index 768877f..a9dbe4b 100644 --- a/qmerge.c +++ b/qmerge.c @@ -686,6 +686,10 @@ pkg_run_func_at(int dirfd, const char *vdb_path, const char *phases, const char "export MERGE_TYPE=binary\n" "export ROOT='%4$s'\n" "export EROOT=\"${ROOT%%/}${EPREFIX%%/}/\"\n" + /* BROOT, SYSROOT, ESYSROOT: PMS table 8.3 Prefix values for DEPEND */ + "export BROOT=\n" + "export SYSROOT=\"${ROOT}\"\n" + "export ESYSROOT=\"${EROOT}\"\n" "export D=\"%5$s\"\n" "export ED=\"${D%%/}${EPREFIX%%/}/\"\n" "export T=\"%6$s\"\n"