commit: 92c08738bc63433ca60389c7dc9a945054ac842e Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Tue Mar 1 13:08:56 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> 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 <juippis <AT> 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}."
