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 4EE2A138350 for ; Tue, 28 Jan 2020 15:51:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FF35E0835; Tue, 28 Jan 2020 15:51:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 555CBE0835 for ; Tue, 28 Jan 2020 15:51:21 +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 29C7A34E3D3 for ; Tue, 28 Jan 2020 15:51:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 986DD91 for ; Tue, 28 Jan 2020 15:51:18 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1580226670.5d5525ff57e9f0e28a17ea63aac19739cb5e77de.haubi@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 5d5525ff57e9f0e28a17ea63aac19739cb5e77de X-VCS-Branch: master Date: Tue, 28 Jan 2020 15:51:18 +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: b196cd43-a2f0-4615-aa02-72e8acb064f0 X-Archives-Hash: a68924f260ac7251195e4528406269db commit: 5d5525ff57e9f0e28a17ea63aac19739cb5e77de Author: Michael Haubenwallner gentoo org> AuthorDate: Tue Jan 28 15:43:29 2020 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Tue Jan 28 15:51:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5d5525ff bootstrap-prefix.sh: fix circular deps in stage3 In prefix guest, when about to "with_stack_emerge_pkgs sys-apps/grep", portage fails with circular dependencies potentially breakable with USE=-berkdb, although we do set the USE=-berkdb environment variable. The problem here is that USE=-berkdb does apply to the stacked prefix only, not the base prefix, so we need to persist the base prefix' USE flags when we are about to do "with_stack_emerge_pkgs", even if this is not a problem with RAP right now, maybe because of a different tree. Signed-off-by: Michael Haubenwallner gentoo.org> scripts/bootstrap-prefix.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 2c26201141..7bb3e9df35 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1556,6 +1556,17 @@ do_emerge_pkgs() { clang internal-glib ) + if [[ " ${USE} " == *" prefix-stack "* ]] && + [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] && + ! grep -q '^USE=".*" # by bootstrap-prefix.sh$' "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf" + then + # With prefix-stack, the USE env var does apply to the stacked + # prefix only, not the base prefix (any more? since some portage + # version?), so we have to persist the base USE flags into the + # base prefix - without the additional incoming USE flags. + echo "USE=\"\${USE} ${myuse[*]}\" # by bootstrap-prefix.sh" \ + >> "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf" + fi myuse=" ${myuse[*]} " local use for use in ${USE} ; do