From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 963491382C5 for ; Sun, 18 Apr 2021 20:47:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD049E0729; Sun, 18 Apr 2021 20:47:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4A9BE0729 for ; Sun, 18 Apr 2021 20:47:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92CC7340D96 for ; Sun, 18 Apr 2021 20:47:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D29F66A for ; Sun, 18 Apr 2021 20:47:09 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1618778795.d9b6bf437b114de25fcc7807bfb97736ede1305c.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.51.0-r2.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: d9b6bf437b114de25fcc7807bfb97736ede1305c X-VCS-Branch: master Date: Sun, 18 Apr 2021 20:47:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37948f68-f3a8-4e50-a418-f094ef9fd05c X-Archives-Hash: 013c8d203fd3ccbf803f6fca25c306fc commit: d9b6bf437b114de25fcc7807bfb97736ede1305c Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Apr 18 20:46:21 2021 +0000 Commit: Georgy Yakovlev gentoo 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 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