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 463D8158089 for ; Wed, 27 Sep 2023 09:12:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FA872BC028; Wed, 27 Sep 2023 09:12:40 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 364792BC029 for ; Wed, 27 Sep 2023 09:12:40 +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 37801335CDF for ; Wed, 27 Sep 2023 09:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABC3E1270 for ; Wed, 27 Sep 2023 09:12:37 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1695805952.59d389e33aef580b4d5ae2aa9acde86dc0081042.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/llvm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 59d389e33aef580b4d5ae2aa9acde86dc0081042 X-VCS-Branch: master Date: Wed, 27 Sep 2023 09:12:37 +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: 3249c616-dccc-4a18-9397-5d632df4d8af X-Archives-Hash: 9d40757e1c2e51228affd209aaf83029 commit: 59d389e33aef580b4d5ae2aa9acde86dc0081042 Author: Alexey Sokolov asokolov org> AuthorDate: Fri Sep 15 07:29:55 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 27 09:12:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d389e3 llvm.eclass: add option to skip llvm_pkg_setup To be used during prefix bootstrap using LLVM toolchain. Without this, several LLVM packages don't build. Bug: https://bugs.gentoo.org/758167 Signed-off-by: Alexey Sokolov asokolov.org> Signed-off-by: Michał Górny gentoo.org> eclass/llvm.eclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass index 8198650aad9a..57faa48819db 100644 --- a/eclass/llvm.eclass +++ b/eclass/llvm.eclass @@ -80,6 +80,13 @@ DEPEND="!!sys-devel/llvm:0" # Correct values of LLVM slots, newest first. declare -g -r _LLVM_KNOWN_SLOTS=( {18..8} ) +# @ECLASS_VARIABLE: LLVM_ECLASS_SKIP_PKG_SETUP +# @INTERNAL +# @DESCRIPTION: +# If set to a non-empty value, llvm_pkg_setup will not perform LLVM version +# check, nor set PATH. Useful for bootstrap-prefix.sh, where AppleClang has +# unparseable version numbers, which are irrelevant anyway. + # @FUNCTION: get_llvm_slot # @USAGE: [-b|-d] [] # @DESCRIPTION: @@ -242,6 +249,10 @@ llvm_fix_tool_path() { llvm_pkg_setup() { debug-print-function ${FUNCNAME} "${@}" + if [[ ${LLVM_ECLASS_SKIP_PKG_SETUP} ]]; then + return + fi + if [[ ${MERGE_TYPE} != binary ]]; then LLVM_SLOT=$(get_llvm_slot "${LLVM_MAX_SLOT}")