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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6573A1382C5 for ; Fri, 12 Feb 2021 01:10:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FD5CE087E; Fri, 12 Feb 2021 01:10:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79A1FE0871 for ; Fri, 12 Feb 2021 01:10:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DC17340B9C for ; Fri, 12 Feb 2021 01:10:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A5364C7 for ; Fri, 12 Feb 2021 01:10:33 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1613092223.93df4943decd9c388e1a310651b49a1d7bac40c3.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild X-VCS-Directories: dev-lang/spidermonkey/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 93df4943decd9c388e1a310651b49a1d7bac40c3 X-VCS-Branch: master Date: Fri, 12 Feb 2021 01:10:33 +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: 4f01f6dd-bf31-477b-b835-0401073ba095 X-Archives-Hash: 0911c9b294767d8726cd792797d5a509 commit: 93df4943decd9c388e1a310651b49a1d7bac40c3 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Feb 12 01:10:12 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Feb 12 01:10:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93df4943 dev-lang/spidermonkey: prepare for rust-1.50.0 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild | 4 ++-- dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild index 52a9c0590f0..e46b689bbc5 100644 --- a/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild @@ -164,12 +164,12 @@ pkg_setup() { [[ -z ${version_lld} ]] && die "Failed to read ld.lld version!" # temp fix for https://bugs.gentoo.org/768543 - # we can assume that rust 1.49.0 always uses llvm 11 + # we can assume that rust 1.{49,50}.0 always uses llvm 11 local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }') [[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}") [[ -z ${version_rust} ]] && die "Failed to read version from rustc!" - if ver_test "${version_rust}" -eq "1.49" ; then + if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then local version_llvm_rust="11" else local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }') diff --git a/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild b/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild index 4ae9d2493ca..a32a7ed2f25 100644 --- a/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild @@ -164,12 +164,12 @@ pkg_setup() { [[ -z ${version_lld} ]] && die "Failed to read ld.lld version!" # temp fix for https://bugs.gentoo.org/768543 - # we can assume that rust 1.49.0 always uses llvm 11 + # we can assume that rust 1.{49,50}.0 always uses llvm 11 local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }') [[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}") [[ -z ${version_rust} ]] && die "Failed to read version from rustc!" - if ver_test "${version_rust}" -eq "1.49" ; then + if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then local version_llvm_rust="11" else local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')