| 1 |
commit: 93df4943decd9c388e1a310651b49a1d7bac40c3 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 12 01:10:12 2021 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 12 01:10:23 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93df4943 |
| 7 |
|
| 8 |
dev-lang/spidermonkey: prepare for rust-1.50.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild | 4 ++-- |
| 14 |
dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild | 4 ++-- |
| 15 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild |
| 18 |
index 52a9c0590f0..e46b689bbc5 100644 |
| 19 |
--- a/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild |
| 20 |
+++ b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild |
| 21 |
@@ -164,12 +164,12 @@ pkg_setup() { |
| 22 |
[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!" |
| 23 |
|
| 24 |
# temp fix for https://bugs.gentoo.org/768543 |
| 25 |
- # we can assume that rust 1.49.0 always uses llvm 11 |
| 26 |
+ # we can assume that rust 1.{49,50}.0 always uses llvm 11 |
| 27 |
local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }') |
| 28 |
[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}") |
| 29 |
[[ -z ${version_rust} ]] && die "Failed to read version from rustc!" |
| 30 |
|
| 31 |
- if ver_test "${version_rust}" -eq "1.49" ; then |
| 32 |
+ if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then |
| 33 |
local version_llvm_rust="11" |
| 34 |
else |
| 35 |
local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }') |
| 36 |
|
| 37 |
diff --git a/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild b/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild |
| 38 |
index 4ae9d2493ca..a32a7ed2f25 100644 |
| 39 |
--- a/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild |
| 40 |
+++ b/dev-lang/spidermonkey/spidermonkey-78.7.1.ebuild |
| 41 |
@@ -164,12 +164,12 @@ pkg_setup() { |
| 42 |
[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!" |
| 43 |
|
| 44 |
# temp fix for https://bugs.gentoo.org/768543 |
| 45 |
- # we can assume that rust 1.49.0 always uses llvm 11 |
| 46 |
+ # we can assume that rust 1.{49,50}.0 always uses llvm 11 |
| 47 |
local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }') |
| 48 |
[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}") |
| 49 |
[[ -z ${version_rust} ]] && die "Failed to read version from rustc!" |
| 50 |
|
| 51 |
- if ver_test "${version_rust}" -eq "1.49" ; then |
| 52 |
+ if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then |
| 53 |
local version_llvm_rust="11" |
| 54 |
else |
| 55 |
local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }') |
Archives