commit: 1632545a561002c8d2b743f6130bbd25b5a7a742 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Jul 24 00:59:07 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Jul 24 01:02:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1632545a
mail-client/thunderbird: move fatal rust version check to pkg_setup In case no rust version is installed yet, the rust check in pkg_pretend will block any PM run which would pull in rust. Moving fatal check to pkg_setup will still prevent unnecessary compile time but avoid that block. Closes: https://bugs.gentoo.org/733692 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> mail-client/thunderbird/thunderbird-68.10.0.ebuild | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/mail-client/thunderbird/thunderbird-68.10.0.ebuild b/mail-client/thunderbird/thunderbird-68.10.0.ebuild index 42387e59cce..e2ff8fb4357 100644 --- a/mail-client/thunderbird/thunderbird-68.10.0.ebuild +++ b/mail-client/thunderbird/thunderbird-68.10.0.ebuild @@ -220,10 +220,10 @@ pkg_pretend() { local rustc_version=( $(eselect --brief rust show 2>/dev/null) ) rustc_version=${rustc_version[0]/rust-bin-/} rustc_version=${rustc_version/rust-/} - [[ -z "${rustc_version}" ]] && die "Failed to determine rustc version!" - - if ver_test "${rustc_version}" -ge "1.45.0" ; then - die "Rust >=1.45.0 is not supported. Please use 'eselect rust' to switch to <rust-1.45.0!" + if [[ -n "${rustc_version}" ]] ; then + if ver_test "${rustc_version}" -ge "1.45.0" ; then + die "Rust >=1.45.0 is not supported. Please use 'eselect rust' to switch to <rust-1.45.0!" + fi fi if use pgo ; then @@ -247,6 +247,15 @@ pkg_setup() { moz_pkgsetup if [[ ${MERGE_TYPE} != binary ]] ; then + local rustc_version=( $(eselect --brief rust show 2>/dev/null) ) + rustc_version=${rustc_version[0]/rust-bin-/} + rustc_version=${rustc_version/rust-/} + [[ -z "${rustc_version}" ]] && die "Failed to determine rustc version!" + + if ver_test "${rustc_version}" -ge "1.45.0" ; then + die "Rust >=1.45.0 is not supported. Please use 'eselect rust' to switch to <rust-1.45.0!" + fi + # Ensure we have enough disk space to compile if use pgo || use lto || use debug || use test ; then CHECKREQS_DISK_BUILD="8G"
