commit:     8cfa01fdc5e754854ffd028d1d71d75b4cfdef3a
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Jul  4 16:23:29 2024 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Thu Jul  4 16:23:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8cfa01fd

dev-lang/rust: sync ::gentoo

Signed-off-by: orbea <orbea <AT> riseup.net>

 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 0000000..583f400
--- /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 fd51f24..0e26ed2 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() {

Reply via email to