From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF45515808A for ; Sun, 03 Aug 2025 10:48:52 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8FEA7340D21 for ; Sun, 03 Aug 2025 10:48:52 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 856A11104DB; Sun, 03 Aug 2025 10:48:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 79BBE1104DB for ; Sun, 03 Aug 2025 10:48:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 283B5340D1B for ; Sun, 03 Aug 2025 10:48:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B197831BA for ; Sun, 03 Aug 2025 10:48: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: <1754218085.b1e6f8f2c4e3b3cbf5e911b6d2bd970cb244028d.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: b1e6f8f2c4e3b3cbf5e911b6d2bd970cb244028d X-VCS-Branch: master Date: Sun, 03 Aug 2025 10:48: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: 865f08c1-9ec9-4b89-8b62-d620ff646d4e X-Archives-Hash: da62e262f2fe15ee00f1dbc2c1d76241 commit: b1e6f8f2c4e3b3cbf5e911b6d2bd970cb244028d Author: Fabian Groffen gentoo org> AuthorDate: Sun Aug 3 10:48:05 2025 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Aug 3 10:48:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b1e6f8f2 scripts/bootstrap-prefix: also don't require zstd for GCC build stage2: like binutils, don't expect libzstd to exist for gcc either Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 2ccdf2dd28..1ebdde823a 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2086,11 +2086,17 @@ bootstrap_stage2() { echo "sys-devel/gcc -pie" >> "${ROOT}"/tmp/etc/portage/package.use fi - # don't use CET/ZSTD, we don't know if the host (and compiler) supports it - echo "sys-devel/binutils -cet -zstd" >> \ - "${ROOT}"/tmp/etc/portage/profile/package.use.force - echo "sys-devel/binutils-cet zstd" >> \ - "${ROOT}"/tmp/etc/portage/profile/package.use.mask + # don't use zstd at this point, the host may not have it installed + # don't use CET with binutils, we don't know if the host compiler + # supports it + { + echo "sys-devel/binutils -cet -zstd" + echo "sys-devel/gcc -zstd" + } >> "${ROOT}"/tmp/etc/portage/profile/package.use.force + { + echo "sys-devel/binutils cet zstd" + echo "sys-devel/gcc zstd" + } >> "${ROOT}"/tmp/etc/portage/profile/package.use.mask emerge_pkgs --nodeps "${pkgs[@]}" || return 1