commit: 051355c623854159c59fa1af75c4fbb7dbb8993e Author: Violet Purcell <vimproved <AT> inventati <DOT> org> AuthorDate: Sun Feb 11 01:47:25 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 11 05:59:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051355c6
dev-lang/rust: rebase and re-apply musl dynamic linking patch for 1.75 This somehow got lost in the 1.75 bump, but it is required for e.g. Firefox to compile on musl. Bug: https://bugs.gentoo.org/922880 Signed-off-by: Violet Purcell <vimproved <AT> inventati.org> Closes: https://github.com/gentoo/gentoo/pull/35267 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/rust/files/1.75.0-musl-dynamic-linking.patch | 19 +++++++++++++++++++ .../{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} | 1 + 2 files changed, 20 insertions(+) diff --git a/dev-lang/rust/files/1.75.0-musl-dynamic-linking.patch b/dev-lang/rust/files/1.75.0-musl-dynamic-linking.patch new file mode 100644 index 000000000000..7dc34f8ad6b8 --- /dev/null +++ b/dev-lang/rust/files/1.75.0-musl-dynamic-linking.patch @@ -0,0 +1,19 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt <anar...@gentoo.org> +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt <anar...@gentoo.org> +--- a/compiler/rustc_target/src/spec/base/linux_musl.rs ++++ b/compiler/rustc_target/src/spec/base/linux_musl.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/dev-lang/rust/rust-1.75.0.ebuild b/dev-lang/rust/rust-1.75.0-r1.ebuild similarity index 99% rename from dev-lang/rust/rust-1.75.0.ebuild rename to dev-lang/rust/rust-1.75.0-r1.ebuild index 1c9761e003fe..19b85fcb4ae6 100644 --- a/dev-lang/rust/rust-1.75.0.ebuild +++ b/dev-lang/rust/rust-1.75.0-r1.ebuild @@ -163,6 +163,7 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( + "${FILESDIR}"/1.75.0-musl-dynamic-linking.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch #"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch
