diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-02-12 02:06:58 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-02-12 02:10:21 +0100 |
| commit | 7ab9790bf7271342df47a5376f77b5350b3f2ee0 (patch) | |
| tree | 88a564d4e99ed83d654b81365c985eefdbf10fb7 /www-client/firefox | |
| parent | www-client/firefox: drop old (diff) | |
| download | gentoo-7ab9790bf7271342df47a5376f77b5350b3f2ee0.tar.gz gentoo-7ab9790bf7271342df47a5376f77b5350b3f2ee0.tar.bz2 gentoo-7ab9790bf7271342df47a5376f77b5350b3f2ee0.zip | |
www-client/firefox: prepare for rust-1.50.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'www-client/firefox')
| -rw-r--r-- | www-client/firefox/firefox-78.7.0.ebuild | 4 | ||||
| -rw-r--r-- | www-client/firefox/firefox-78.7.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | www-client/firefox/firefox-85.0.2-r1.ebuild | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/www-client/firefox/firefox-78.7.0.ebuild b/www-client/firefox/firefox-78.7.0.ebuild index 42da6703de58..c5eb6dc9303d 100644 --- a/www-client/firefox/firefox-78.7.0.ebuild +++ b/www-client/firefox/firefox-78.7.0.ebuild @@ -409,12 +409,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/www-client/firefox/firefox-78.7.1-r1.ebuild b/www-client/firefox/firefox-78.7.1-r1.ebuild index 40219f1f968e..443b023ec8bd 100644 --- a/www-client/firefox/firefox-78.7.1-r1.ebuild +++ b/www-client/firefox/firefox-78.7.1-r1.ebuild @@ -409,12 +409,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/www-client/firefox/firefox-85.0.2-r1.ebuild b/www-client/firefox/firefox-85.0.2-r1.ebuild index acf090b96025..a4fbb463b600 100644 --- a/www-client/firefox/firefox-85.0.2-r1.ebuild +++ b/www-client/firefox/firefox-85.0.2-r1.ebuild @@ -405,12 +405,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 }') |