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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CF5D158090 for ; Tue, 24 May 2022 17:07:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 865AEE087A; Tue, 24 May 2022 17:07:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 624F7E087A for ; Tue, 24 May 2022 17:07:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C66D341EAA for ; Tue, 24 May 2022 17:07:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9E131E for ; Tue, 24 May 2022 17:07:52 +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: <1653412064.46e142254f2fb8e4bc1af0989a18f37026616d83.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.59.0.ebuild dev-lang/rust/rust-1.60.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 46e142254f2fb8e4bc1af0989a18f37026616d83 X-VCS-Branch: master Date: Tue, 24 May 2022 17:07:52 +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: 0f26c5f6-7ba8-49fc-8c37-bccf67c49bab X-Archives-Hash: 7525a202150d7424a4cb53333a458e28 commit: 46e142254f2fb8e4bc1af0989a18f37026616d83 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue May 24 17:02:23 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue May 24 17:07:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e14225 dev-lang/rust: adjust build reqs Closes: https://bugs.gentoo.org/845354 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.59.0.ebuild | 6 +++--- dev-lang/rust/rust-1.60.0.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-lang/rust/rust-1.59.0.ebuild b/dev-lang/rust/rust-1.59.0.ebuild index e8023bd2721d..b4e6eebe900f 100644 --- a/dev-lang/rust/rust-1.59.0.ebuild +++ b/dev-lang/rust/rust-1.59.0.ebuild @@ -191,10 +191,10 @@ bootstrap_rust_version_check() { } pre_build_checks() { - local M=4096 - # multiply requirements by 1.5 if we are doing x86-multilib + local M=8192 + # multiply requirements by 1.3 if we are doing x86-multilib if use amd64; then - M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 )) + M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 )) fi M=$(( $(usex clippy 128 0) + ${M} )) M=$(( $(usex miri 128 0) + ${M} )) diff --git a/dev-lang/rust/rust-1.60.0.ebuild b/dev-lang/rust/rust-1.60.0.ebuild index 52373f38bea0..f7e83c6bd47c 100644 --- a/dev-lang/rust/rust-1.60.0.ebuild +++ b/dev-lang/rust/rust-1.60.0.ebuild @@ -189,10 +189,10 @@ bootstrap_rust_version_check() { } pre_build_checks() { - local M=4096 - # multiply requirements by 1.5 if we are doing x86-multilib + local M=8192 + # multiply requirements by 1.3 if we are doing x86-multilib if use amd64; then - M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 )) + M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 )) fi M=$(( $(usex clippy 128 0) + ${M} )) M=$(( $(usex miri 128 0) + ${M} ))