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 E3365158020 for ; Mon, 7 Nov 2022 15:06:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61ED8E087E; Mon, 7 Nov 2022 15:06:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 498B7E087E for ; Mon, 7 Nov 2022 15:06:01 +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 6815933BF5D for ; Mon, 7 Nov 2022 15:06:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E35A6E9 for ; Mon, 7 Nov 2022 15:05:58 +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: <1667833417.8f0f9b26edf493e6e8d4c689abbbbc4924f56cee.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-102.4.0.ebuild www-client/firefox/firefox-106.0.5.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 8f0f9b26edf493e6e8d4c689abbbbc4924f56cee X-VCS-Branch: master Date: Mon, 7 Nov 2022 15:05:58 +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: 2ab57c6a-2c14-4860-a4d6-8e296873ebb3 X-Archives-Hash: 3fe40a82b978c6a6905e70c655253724 commit: 8f0f9b26edf493e6e8d4c689abbbbc4924f56cee Author: Joonas Niilola gentoo org> AuthorDate: Mon Nov 7 14:53:45 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Nov 7 15:03:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0f9b26 www-client/firefox: fix ebuilds to reflect latest llvm.eclass changes - also update lld check to match a slot. Closes: https://bugs.gentoo.org/879177 Signed-off-by: Joonas Niilola gentoo.org> www-client/firefox/firefox-102.4.0.ebuild | 10 ++++++---- www-client/firefox/firefox-106.0.5.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/www-client/firefox/firefox-102.4.0.ebuild b/www-client/firefox/firefox-102.4.0.ebuild index 9cb14de9e22a..0d52f3b9361f 100644 --- a/www-client/firefox/firefox-102.4.0.ebuild +++ b/www-client/firefox/firefox-102.4.0.ebuild @@ -211,8 +211,8 @@ llvm_check_deps() { fi if use clang ; then - if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then - einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then + einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi @@ -618,10 +618,12 @@ src_configure() { einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" local have_switched_compiler= - if use clang && ! tc-is-clang ; then + if use clang; then # Force clang einfo "Enforcing the use of clang due to USE=clang ..." - have_switched_compiler=yes + if tc-is-gcc; then + have_switched_compiler=yes + fi AR=llvm-ar AS=llvm-as CC=${CHOST}-clang diff --git a/www-client/firefox/firefox-106.0.5.ebuild b/www-client/firefox/firefox-106.0.5.ebuild index 0c86994fb351..199bc3a3de9c 100644 --- a/www-client/firefox/firefox-106.0.5.ebuild +++ b/www-client/firefox/firefox-106.0.5.ebuild @@ -226,8 +226,8 @@ llvm_check_deps() { fi if use clang ; then - if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then - einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then + einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 return 1 fi @@ -663,10 +663,12 @@ src_configure() { einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" local have_switched_compiler= - if use clang && ! tc-is-clang ; then + if use clang; then # Force clang einfo "Enforcing the use of clang due to USE=clang ..." - have_switched_compiler=yes + if tc-is-gcc; then + have_switched_compiler=yes + fi AR=llvm-ar AS=llvm-as CC=${CHOST}-clang