commit: 19b9dc9a55480c8e3773e898c6e79ef31ae0a729 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Dec 15 20:07:55 2025 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Dec 15 20:07:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=19b9dc9a
scripts/bootstrap-prefix: drop zstd as binutils dep for RAP in stage3 zstd now requires meson, which needs python which we don't have yet, so disable it until we reinstall @system after --sync Closes: https://bugs.gentoo.org/967234 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> scripts/bootstrap-prefix.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index ecf5872f0b..9dcf645273 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2143,7 +2143,7 @@ bootstrap_stage2() { # 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 + # supports it #936629 { echo "sys-devel/binutils -cet -zstd" echo "sys-devel/gcc -zstd" @@ -2454,7 +2454,6 @@ bootstrap_stage3() { sys-devel/binutils-config sys-libs/zlib app-arch/xz-utils - app-arch/zstd "${linker_pkgs[@]}" ) # use the new dynamic linker in place of rpath from now on. @@ -2711,9 +2710,10 @@ set_helper_vars() { SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"} # USE-flags to disable during bootstrap for they produce - # unnecessary, or worse: circular deps #901101, #936629 - # - nghttp2 -> cmake -> curl -> nghttp2 (http2) + # unnecessary, or worse: circular deps + # - nghttp2 -> cmake -> curl -> nghttp2 (http2) #901101 # - ensurepip -> python -> ensurepip (ensurepip) + # - binutils -> zstd -> meson -> python (zstd) #967234 DISABLE_USE=( "-crypt" "-curl_quic_openssl" # curl @@ -2722,6 +2722,7 @@ set_helper_vars() { "-http2" # curl "-http3" # curl "-quic" # curl + "-zstd" # binutils/gcc ) export MAKE CONFIG_SHELL
