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 459C21382C5 for ; Tue, 8 Jun 2021 09:14:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99CB0E085B; Tue, 8 Jun 2021 09:14:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5FF82E085B for ; Tue, 8 Jun 2021 09:14:52 +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 36D0F340562 for ; Tue, 8 Jun 2021 09:14:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D9515C4 for ; Tue, 8 Jun 2021 09:14:49 +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: <1623143539.29f4de200d9916a117ec1658c87fad73f3a513e2.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 29f4de200d9916a117ec1658c87fad73f3a513e2 X-VCS-Branch: master Date: Tue, 8 Jun 2021 09:14:49 +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: a61184dd-76c3-40ee-b444-b35738d5b9ae X-Archives-Hash: 50531dcdd266bdd8140d4fdb15a491e4 commit: 29f4de200d9916a117ec1658c87fad73f3a513e2 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jun 8 09:12:19 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jun 8 09:12:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=29f4de20 scripts/bootstrap-prefix: fix g++ wrapper In 2dfc27192fbe00e4661ca06a0b18f09a4137dd50 the executable name was fixed, so it wasn't dependant on PATH, however, it broke g++ for that would still call gcc. Fix that now. Mask GCC-11 during stage2 and stage3 for bug #788613. Bug: https://bugs.gentoo.org/788613 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 97ffa2233d..8fab4abf44 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -450,6 +450,12 @@ bootstrap_setup() { ACCEPT_KEYWORDS="~${ARCH}-linux" EOF + # bug #788613 avoid gcc-11 during stage 2/3 prior sync/emerge -e + is-rap && cat >> "${ROOT}"/etc/portage/make.profile/package.mask <<-EOF + # during bootstrap mask, bug #788613 + >=sys-devel/gcc-11 + EOF + # Use package.use to disable in the portage tree to be shared between # stage2 and stage3. The hack will be undone during tree sync in stage3. cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF @@ -1355,8 +1361,8 @@ bootstrap_libressl() { bootstrap_stage_host_gentoo() { if ! is-rap ; then - einfo "Shortcut only supports prefix-standalone, but we are bootstrapping" - einfo "prefix-rpath. Do nothing." + einfo "Shortcut only supports prefix-standalone, but we " + einfo "are bootstrapping prefix-rpath. Do nothing." return 0 fi @@ -1479,7 +1485,11 @@ bootstrap_stage1() { PATH="${ORIGINAL_PATH}" export PATH exec "$(type -P gcc)" "\$@" EOF - cp "${ROOT}"/tmp/usr/local/bin/g{cc,++} + cat >> "${ROOT}"/tmp/usr/local/bin/g++ <<-EOF + #! /bin/sh + PATH="${ORIGINAL_PATH}" export PATH + exec "$(type -P g++)" "\$@" + EOF chmod 755 "${ROOT}"/tmp/usr/local/bin/g{cc,++} fi ;; @@ -1906,7 +1916,11 @@ bootstrap_stage3() { } # pre_emerge_pkgs relies on stage 2 portage. - pre_emerge_pkgs() { is-rap && without_stack_emerge_pkgs "$@" || with_stack_emerge_pkgs "$@"; } + pre_emerge_pkgs() { + is-rap \ + && without_stack_emerge_pkgs "$@" \ + || with_stack_emerge_pkgs "$@" + } # Some packages fail to properly depend on sys-apps/texinfo. # We don't really need that package, so we fake it instead,