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 2457415808B for ; Tue, 1 Mar 2022 13:09:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4981EE07D3; Tue, 1 Mar 2022 13:09:56 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27174E07D3 for ; Tue, 1 Mar 2022 13:09:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 272B134334E for ; Tue, 1 Mar 2022 13:09:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D08882FB for ; Tue, 1 Mar 2022 13:09:53 +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: <1646140190.92c08738bc63433ca60389c7dc9a945054ac842e.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/spidermonkey-91.6.0.ebuild X-VCS-Directories: dev-lang/spidermonkey/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 92c08738bc63433ca60389c7dc9a945054ac842e X-VCS-Branch: master Date: Tue, 1 Mar 2022 13:09:53 +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: 9cc10960-9707-4031-b1c5-2f1ae76ea016 X-Archives-Hash: c689e982adf0478484d9c649cd6d5f67 commit: 92c08738bc63433ca60389c7dc9a945054ac842e Author: Joonas Niilola gentoo org> AuthorDate: Tue Mar 1 13:08:56 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Mar 1 13:09:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c08738 dev-lang/spidermonkey: require newer rust for 91.6.0 Closes: https://bugs.gentoo.org/834395 Signed-off-by: Joonas Niilola gentoo.org> dev-lang/spidermonkey/spidermonkey-91.6.0.ebuild | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dev-lang/spidermonkey/spidermonkey-91.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-91.6.0.ebuild index f54ad7dc04ec..404d4dc5de00 100644 --- a/dev-lang/spidermonkey/spidermonkey-91.6.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-91.6.0.ebuild @@ -71,7 +71,7 @@ IUSE="clang cpu_flags_arm_neon debug +jit lto test" RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} - virtual/rust + >=virtual/rust-1.51.0 virtual/pkgconfig test? ( $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]') @@ -163,19 +163,9 @@ pkg_setup() { [[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}") [[ -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,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}" -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 }') - [[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}") - [[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!" - fi + local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }') + [[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}") + [[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!" if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."