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 E489D1581C1 for ; Thu, 4 Jul 2024 01:15:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 498CE2BC047; Thu, 4 Jul 2024 01:15:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2FE8A2BC047 for ; Thu, 4 Jul 2024 01:15:28 +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 E9AC134300E for ; Thu, 4 Jul 2024 01:15:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A0271DCA for ; Thu, 4 Jul 2024 01:15:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1720055685.7542c63f99687fafeff4fb5c972ef93a84f77db2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/, dev-lang/rust/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/files/1.79.0-revert-8c40426.patch dev-lang/rust/rust-1.79.0.ebuild X-VCS-Directories: dev-lang/rust/files/ dev-lang/rust/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7542c63f99687fafeff4fb5c972ef93a84f77db2 X-VCS-Branch: master Date: Thu, 4 Jul 2024 01:15:24 +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: fe27f46e-8ee6-405f-bb56-6acb65e41e3c X-Archives-Hash: 08f4406f82dd6a593dd9ad567522218f commit: 7542c63f99687fafeff4fb5c972ef93a84f77db2 Author: Matoro Mahri matoro tk> AuthorDate: Wed Jul 3 02:29:27 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jul 4 01:14:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7542c63f dev-lang/rust: add patch to disable setting CMAKE_ASM_COMPILER This is apparently not (or no longer) consumed by the bundled LLVM, which makes our QA complain. See: https://github.com/rust-lang/rust/commit/8c40426051a667673cdac9975f84cb6acd4e245f Closes: https://bugs.gentoo.org/933382 Signed-off-by: Matoro Mahri matoro.tk> Closes: https://github.com/gentoo/gentoo/pull/37405 Signed-off-by: Sam James gentoo.org> dev-lang/rust/files/1.79.0-revert-8c40426.patch | 18 ++++++++++++++++++ dev-lang/rust/rust-1.79.0.ebuild | 1 + 2 files changed, 19 insertions(+) diff --git a/dev-lang/rust/files/1.79.0-revert-8c40426.patch b/dev-lang/rust/files/1.79.0-revert-8c40426.patch new file mode 100644 index 000000000000..583f4001c9cb --- /dev/null +++ b/dev-lang/rust/files/1.79.0-revert-8c40426.patch @@ -0,0 +1,18 @@ +This reverts commit 8c40426051a667673cdac9975f84cb6acd4e245f. + +https://bugs.gentoo.org/933382 + +diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs +index d4473e24039..58f351d17fa 100644 +--- a/src/bootstrap/src/core/build_steps/llvm.rs ++++ b/src/bootstrap/src/core/build_steps/llvm.rs +@@ -724,8 +724,7 @@ fn configure_cmake( + } + } + cfg.define("CMAKE_C_COMPILER", sanitize_cc(&cc)) +- .define("CMAKE_CXX_COMPILER", sanitize_cc(&cxx)) +- .define("CMAKE_ASM_COMPILER", sanitize_cc(&cc)); ++ .define("CMAKE_CXX_COMPILER", sanitize_cc(&cxx)); + } + + cfg.build_arg("-j").build_arg(builder.jobs().to_string()); diff --git a/dev-lang/rust/rust-1.79.0.ebuild b/dev-lang/rust/rust-1.79.0.ebuild index e92cb50b5f17..0223902227f8 100644 --- a/dev-lang/rust/rust-1.79.0.ebuild +++ b/dev-lang/rust/rust-1.79.0.ebuild @@ -170,6 +170,7 @@ PATCHES=( #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.78.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.79.0-revert-8c40426.patch ) clear_vendor_checksums() {