commit: d9b6bf437b114de25fcc7807bfb97736ede1305c Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sun Apr 18 20:46:21 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sun Apr 18 20:46:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b6bf43
dev-lang/rust: account for enabled llvm_targets in requirements check Bug: https://bugs.gentoo.org/783768 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> dev-lang/rust/rust-1.51.0-r2.ebuild | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dev-lang/rust/rust-1.51.0-r2.ebuild b/dev-lang/rust/rust-1.51.0-r2.ebuild index b65773f2516..7fef1dcb58a 100644 --- a/dev-lang/rust/rust-1.51.0-r2.ebuild +++ b/dev-lang/rust/rust-1.51.0-r2.ebuild @@ -175,12 +175,20 @@ boostrap_rust_version_check() { pre_build_checks() { local M=8192 + # multiply requirements by 1.5 if we are doing x86-multilib M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 )) M=$(( $(usex clippy 128 0) + ${M} )) M=$(( $(usex miri 128 0) + ${M} )) M=$(( $(usex rls 512 0) + ${M} )) M=$(( $(usex rustfmt 256 0) + ${M} )) - M=$(( $(usex system-llvm 0 2048) + ${M} )) + # add 2G if we compile llvm and 256M per llvm_target + if ! use system-llvm; then + M=$(( 2048 + ${M} )) + local ltarget + for ltarget in ${ALL_LLVM_TARGETS[@]}; do + M=$(( $(usex ${ltarget} 256 0) + ${M} )) + done + fi M=$(( $(usex wasm 256 0) + ${M} )) M=$(( $(usex debug 15 10) * ${M} / 10 )) eshopts_push -s extglob
