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 0F482158089 for ; Wed, 13 Sep 2023 07:41:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A825D2BC038; Wed, 13 Sep 2023 07:41:22 +0000 (UTC) Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) (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 816922BC014 for ; Wed, 13 Sep 2023 07:41:22 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-50098cc8967so10468272e87.1 for ; Wed, 13 Sep 2023 00:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asokolov.org; s=google; t=1694590881; x=1695195681; darn=lists.gentoo.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=w6hFv4c0cbRUcqIGpVet+HZ6Jk976EsGXVjbTaMlxH0=; b=L+gEs4JgKmfWSORkDBfA9hm3+hHA3y4DveMjCbJxPCNvjcNS90W3ZviMil3TDKnP+2 FRVuz834nq4GNVI0612dtVzSV94BmO65u7hzXpj94FKk5pj66yvfsqO1NrGWljDmO9/M Ljr2XetbLF9anoEjRyFLibbegnxxB5V/Id8fMCN3+kQfQZ5Ir2qXRDiZswpr8ajj6tLO JK4VBoUHpw1lIri2N0pSJJufU6mLllSlU9UK9xX6KJ0AZPwfMBbo24AcM64rcdAS1w1Q xNlcEntFtCRqD5Dmj3PVG2CyHyQnH3LBQ5wyxJ8NYP7HnTRqr9V6YS6KwWfLi4nGzNdT UIlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694590881; x=1695195681; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=w6hFv4c0cbRUcqIGpVet+HZ6Jk976EsGXVjbTaMlxH0=; b=rhqiizGhsgSKokFauKc224GVQoQhF1bgXZJQTxUwoSkCNwMPL4u3ju/1hqr26iqZrc 2seG+W//cp40dXCMadvVJoNbsYTibQzQU5BXj9RFTc4qxzrbWvewuSaPesxMkJK6hpyf eUsvlG7n9MYxseg47xIBtRoyttBTrQkHZtwAzYKrUNAqbWGAmlaNcHZtR/pB6jm0QhFp v+sb2vIz3Y3EAm2hQUHFwFwmIdF1XPCMYcl6Esdo/hBWs5yI0cjOGbXUJ4CGWHaLj6/I 2M1HeMZ1V4g1cebPtp3mykh9klTapoeBy1cIGUqwiFeX1s9keDZu9TtkyhW1nsi52LJ1 f9Ew== X-Gm-Message-State: AOJu0YzUDq7E3ZAXbsfer0YngUbGEnddUVxFASiB3OjDPQ9HkjV1fglG i8KGaCgqr8BaPfORi7RBf1AffQdIu+k//LslIpc= X-Google-Smtp-Source: AGHT+IH9CJuwbn9AtoxlG2/qDit/ISM1vijrk9D3Q6iMdo9bMw/PNJRxCG6j1nDaeZB4Kznp9jvicA== X-Received: by 2002:a19:ca0b:0:b0:502:d85b:5de with SMTP id a11-20020a19ca0b000000b00502d85b05demr1053358lfg.68.1694590880545; Wed, 13 Sep 2023 00:41:20 -0700 (PDT) Received: from ?IPV6:2a02:278:41a0:64d:8748:92b4:fdb1:c055? ([2a02:278:41a0:64d:8748:92b4:fdb1:c055]) by smtp.googlemail.com with ESMTPSA id 12-20020a05600c240c00b003fe29f6b61bsm1188960wmp.46.2023.09.13.00.41.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Sep 2023 00:41:20 -0700 (PDT) Message-ID: <2ca4c1c3-a003-8297-7d79-358cd3d9f274@asokolov.org> Date: Wed, 13 Sep 2023 08:41:18 +0100 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: [gentoo-dev] New bootstrap-prefix global USE-flag and patch to llvm.eclass Content-Language: en-GB To: gentoo-dev@lists.gentoo.org References: <270a8b9b-e455-099d-1eda-2cf73d31bb10@asokolov.org> <87ledavbev.fsf@gentoo.org> From: Alexey Sokolov In-Reply-To: <87ledavbev.fsf@gentoo.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Archives-Salt: 2344085d-31f0-4248-afd1-43d6e00513dc X-Archives-Hash: 4c5a0c9180b114725ba99a3eba435e61 13.09.2023 07:22, Sam James пишет: > > Fabian Groffen writes: > >> [[PGP Signed Part:Undecided]] >> On 12-09-2023 20:32:19 +0100, Alexey Sokolov wrote: >>> Bug: https://bugs.gentoo.org/758167 >>> Full PR is at https://github.com/gentoo/gentoo/pull/32730 >>> >>> Several LLVM packages require this early return, otherwise they fail to >>> build on Darwin. I'll also need this USE-flag for >>> sys-devel/clang-common, to distinguish between stage2 and stage3 of >>> bootstrap-prefix.sh to configure clang differently. >>> >>> -- >>> Best regards, >>> Alexey "DarthGandalf" Sokolov >> >>> From de2bd1abc3e5c7607413633d132c604c6a801802 Mon Sep 17 00:00:00 2001 >>> From: Alexey Sokolov >>> Date: Mon, 11 Sep 2023 23:26:49 +0100 >>> Subject: [PATCH] llvm.eclass: add global USE flag bootstrap-prefix >>> >>> Mask it everywhere except for prefix profiles >>> >>> Without this, stage2's LLVM packages fail to build. >>> >>> Bug: https://bugs.gentoo.org/758167 >>> Signed-off-by: Alexey Sokolov >>> --- >>> eclass/llvm.eclass | 7 +++++++ >>> profiles/base/use.mask | 4 ++++ >>> profiles/features/prefix/use.mask | 4 ++++ >>> profiles/use.desc | 1 + >>> 4 files changed, 16 insertions(+) >>> >>> diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass >>> index 8198650aad9a7..87c2cedb3a376 100644 >>> --- a/eclass/llvm.eclass >>> +++ b/eclass/llvm.eclass >>> @@ -64,6 +64,8 @@ esac >>> if [[ ! ${_LLVM_ECLASS} ]]; then >>> _LLVM_ECLASS=1 >>> >>> +IUSE="bootstrap-prefix" >>> + >>> # make sure that the versions installing straight into /usr/bin >>> # are uninstalled >>> DEPEND="!!sys-devel/llvm:0" >>> @@ -242,6 +244,11 @@ llvm_fix_tool_path() { >>> llvm_pkg_setup() { >>> debug-print-function ${FUNCNAME} "${@}" >>> >>> + if use bootstrap-prefix; then >>> + # AppleClang has unparseable version numbers, but it's irrelevant anyway >>> + return >>> + fi >>> + >> >> I might misunderstand this, but is this USE-flag supposed to be set only >> during bootstrap, e.g. when host-provided Clang is used? If so, would >> it be possible to use has_version or something instead? > > Another option is something I think we've done in the past - check > for use prefix and then some extra env var we set in the bootstrap > script. Somehow I haven't thought about using extra env var, will try that, thanks. We'll still need the USE-flag for sys-devel/clang-common because it will install different content with and without it, but that can be limited to a single package. > > I think I'd prefer either your idea or the one I just mention > to a USE, but I don't think I feel very strongly between any of it. > > (but given mgorny isn't keen on the USE in the PR at > https://github.com/gentoo/gentoo/pull/32730, > that's a vote against it) > >> >> Thanks, >> Fabian >> > -- Best regards, Alexey "DarthGandalf" Sokolov