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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 733B815852A for ; Wed, 21 Aug 2024 13:30:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E65CE2ACE; Wed, 21 Aug 2024 13:30:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84F6BE2ACE for ; Wed, 21 Aug 2024 13:30:12 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 746E83409EC for ; Wed, 21 Aug 2024 13:30:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CA2215A1 for ; Wed, 21 Aug 2024 13:30:09 +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: <1724246875.715db699226245f555867d8f3774f1f9343f2c8a.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: 715db699226245f555867d8f3774f1f9343f2c8a X-VCS-Branch: master Date: Wed, 21 Aug 2024 13:30:09 +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: a4780800-7565-40bf-b10b-86edb6afd958 X-Archives-Hash: abdb0d75e83bb3304936182b24b6e512 commit: 715db699226245f555867d8f3774f1f9343f2c8a Author: Fabian Groffen gentoo org> AuthorDate: Wed Aug 21 13:27:55 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Aug 21 13:27:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=715db699 scripts/bootstrap-prefix: use DISABLE_USE for circular deps Use set of USE-flags that are necessary to break circular deps, and reduce more to just weed unnecessary dependencies. Use DISABLE_USE for the circular ones so they can be properly reused. Bug: https://bugs.gentoo.org/936629 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 98c2282e05..888023efc5 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1805,11 +1805,26 @@ do_emerge_pkgs() { done [[ -n ${pvdb} ]] && continue + # avoid many deps at this stage which aren't necessary, e.g. + # having a bash without readline is OK, we're not using the + # shell interactive local myuse=( "${DISABLE_USE[@]}" - bootstrap - clang - internal-glib + "-acl" + "-berkdb" + "-fortran" # gcc + "-gdbm" + "-libcxx" + "-nls" + "-pcre" + "-python" + "-qmanifest" # portage-utils + "-qtegrity" # portage-utils + "-readline" # bash + "-sanitize" + "bootstrap" + "clang" + "internal-glib" ) local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#"${ROOT}"}" @@ -2450,8 +2465,7 @@ bootstrap_stage3() { # e.g. bug #901101, this is a reduced (e.g. as minimal as possible) # set of DISABLE_USE, to set the stage for solving circular # dependencies, such as: - # - nghttp2 -> cmake -> curl -> nghttp2 - export USE="-git -crypt -http2" + export USE="${DISABLE_USE[*]}" # Portage should figure out itself what it needs to do, if anything. local eflags=( "--deep" "--update" "--changed-use" "@system" ) @@ -2561,28 +2575,16 @@ set_helper_vars() { # USE-flags to disable during bootstrap for they produce # unnecessary, or worse: circular deps #901101, #936629 + # - nghttp2 -> cmake -> curl -> nghttp2 (http2) DISABLE_USE=( - "-acl" - "-berkdb" "-crypt" "-curl_quic_openssl" # curl - "-fortran" # gcc - "-gdbm" "-git" "-http2" # curl "-http3" # curl - "-libcxx" - "-nls" - "-pcre" - "-python" - "-qmanifest" # portage-utils - "-qtegrity" # portage-utils "-quic" # curl - "-readline" # bash - "-sanitize" ) - export MAKE CONFIG_SHELL }