commit: 1b769dd682fdbe71091de1d7105086324f9c42a3 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 09:47:08 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 09:47:08 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=1b769dd6
Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> 1.62.1-musl-dynamic-linking.patch | 19 +++++++++++++++ 1.67.0-doc-wasm.patch | 28 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 24 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++++ 1.81.0-backport-llvm-pr101761.patch | 24 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 23 ++++++++++++++++++ 7 files changed, 150 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..b64775c --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,19 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt <[email protected]> +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt <[email protected]> +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..30cb8b9 --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,28 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin <[email protected]> +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..590f960 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,24 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <[email protected]> +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +https://paste.sr.ht/~kchibisov/682321e0fd4a3ece4a4b7b71591896f5cd3cdb22 +https://github.com/gentoo/gentoo/pull/35246#discussion_r1484525497 + +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs +@@ -237,10 +237,7 @@ fn main() { + // of llvm-config, not the target that we're attempting to link. + let mut cmd = Command::new(&llvm_config); + cmd.arg(llvm_link_arg).arg("--libs"); +- +- if !is_crossed { +- cmd.arg("--system-libs"); +- } ++ cmd.arg("--system-libs"); + + if (target.starts_with("arm") && !target.contains("freebsd")) + || target.starts_with("mips-") diff --git a/1.81.0-backport-bug937164.patch b/1.81.0-backport-bug937164.patch new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/937525 +https://bugs.gentoo.org/937164 + +Unnecessary on 19+ because 2222fddfc0a2ff02036542511597839856289094 adds +SmallVector and SmallVector is fixed by another patch. +--- a/src/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h ++++ b/src/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +@@ -13,6 +13,7 @@ + #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + ++#include <cstdint> + #include <memory> + #include <string> + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..bcc3fee --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/937525 +https://bugs.gentoo.org/937164 +https://github.com/llvm/llvm-project/commit/7e44305041d96b064c197216b931ae3917a34ac1 +https://github.com/llvm/llvm-project/pull/101761 + +From 7e44305041d96b064c197216b931ae3917a34ac1 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `<cstdint>` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `<cstdint>` +which fails to build w/ GCC 15 after a change in libstdc++ [0] + +[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2 +--- a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h ++++ b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +@@ -19,6 +19,7 @@ + #include <algorithm> + #include <cassert> + #include <cstddef> ++#include <cstdint> + #include <cstdlib> + #include <cstring> + #include <functional> diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..1bc84d0 --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/937525 +https://bugs.gentoo.org/937164 +https://github.com/llvm/llvm-project/pull/101766 + +From 5b69d0cf697f0d78406a5a7ed18eaa4f57a0580a Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `<cstdint>` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `<cstdint>` +which fails to build w/ GCC 15 after a change in libstdc++ [0]. + +[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2 +--- a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h ++++ b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +@@ -15,6 +15,7 @@ + #ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H + #define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H + ++#include <cstdint> + #include <memory> + + namespace llvm {
