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 1F377158020 for ; Thu, 17 Nov 2022 12:47:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15A80E0866; Thu, 17 Nov 2022 12:47:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0B75E0866 for ; Thu, 17 Nov 2022 12:47:03 +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 D0EAE340BC0 for ; Thu, 17 Nov 2022 12:47:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3DA5B73E for ; Thu, 17 Nov 2022 12:47:01 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1668689186.4e7c4c14b8a673efd06a7b0d9fc9e67123e72366.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/thunderbird/thunderbird-102.5.0.ebuild X-VCS-Directories: mail-client/thunderbird/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 4e7c4c14b8a673efd06a7b0d9fc9e67123e72366 X-VCS-Branch: master Date: Thu, 17 Nov 2022 12:47:01 +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: d9b05977-bee0-49e7-b6c8-0b69d6835218 X-Archives-Hash: 7a4f546904a43cc869d35c950d005830 commit: 4e7c4c14b8a673efd06a7b0d9fc9e67123e72366 Author: Joonas Niilola gentoo org> AuthorDate: Thu Nov 17 12:46:26 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Nov 17 12:46:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e7c4c14 mail-client/thunderbird: sync the llvm-rust updates from firefox to tb Signed-off-by: Joonas Niilola gentoo.org> mail-client/thunderbird/thunderbird-102.5.0.ebuild | 26 +++++++--------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/mail-client/thunderbird/thunderbird-102.5.0.ebuild b/mail-client/thunderbird/thunderbird-102.5.0.ebuild index 9d4698c7519d..69b2c9fb81f6 100644 --- a/mail-client/thunderbird/thunderbird-102.5.0.ebuild +++ b/mail-client/thunderbird/thunderbird-102.5.0.ebuild @@ -87,6 +87,7 @@ BDEPEND="${PYTHON_DEPS} sys-devel/llvm:15 clang? ( sys-devel/lld:15 + virtual/rust:0/llvm-15 pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) ) @@ -95,14 +96,12 @@ BDEPEND="${PYTHON_DEPS} sys-devel/llvm:14 clang? ( sys-devel/lld:14 + virtual/rust:0/llvm-14 pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ) - || ( - virtual/rust:0/llvm-15 - virtual/rust:0/llvm-14 - ) + !clang? ( virtual/rust ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 @@ -208,6 +207,11 @@ llvm_check_deps() { return 1 fi + if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then + einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + return 1 + fi + if use pgo ; then if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ... Please try emerge -1av =sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* with profile use flag on!" >&2 @@ -397,20 +401,6 @@ pkg_setup() { check-reqs_pkg_setup - # Attempt to force a specific llvm/clang/lld with multiple llvm toolchain slots installed. - local LLVM_USE_SLOT=${LLVM_MAX_SLOT} - if $(has_version "virtual/rust:0/llvm-${LLVM_USE_SLOT}"); then - : - else - ((LLVM_USE_SLOT=LLVM_USE_SLOT-1)) - if $(has_version "virtual/rust:0/llvm-${LLVM_USE_SLOT}"); then - : - else - die "Couldn't find virtual/rust:0/llvm-${LLVM_MAX_SLOT} or virtual/rust:0/llvm-${LLVM_USE_SLOT}. Check your virtual/rust installation." - fi - fi - - local LLVM_MAX_SLOT=${LLVM_USE_SLOT} llvm_pkg_setup if use clang && use lto ; then