diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-02-12 02:10:12 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-02-12 02:10:23 +0100 |
| commit | 93df4943decd9c388e1a310651b49a1d7bac40c3 (patch) | |
| tree | 1aeaa9e833c2646d61c81444865c2abe0b76eaa8 | |
| parent | mail-client/thunderbird: prepare for rust-1.50.0 (diff) | |
| download | gentoo-93df4943decd9c388e1a310651b49a1d7bac40c3.tar.gz gentoo-93df4943decd9c388e1a310651b49a1d7bac40c3.tar.bz2 gentoo-93df4943decd9c388e1a310651b49a1d7bac40c3.zip | |
dev-lang/spidermonkey: prepare for rust-1.50.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild | 4 | ||||
| -rw-r--r-- | 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 52a9c0590f08..e46b689bbc5d 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 4ae9d2493ca3..a32a7ed2f253 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 }') |