[gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/, dev-lang/rust/files/

["Sam James" <sam@gentoo.org>]

commit:     7542c63f99687fafeff4fb5c972ef93a84f77db2
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed Jul  3 02:29:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/37405
Signed-off-by: Sam James <sam <AT> 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() {