commit: eba3efd309f30104ed8e8c6c0a5f9e573c0e0aae Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Sun Jun 1 05:21:23 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Tue Jun 3 21:36:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba3efd3
dev-lang/rust: add GCC 15 patches to older Rusts Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> dev-lang/rust/files/1.74.1-cross-compile-libz.patch | 2 -- dev-lang/rust/rust-1.74.1-r101.ebuild | 7 +++++-- dev-lang/rust/rust-1.75.0-r101.ebuild | 11 ++++++----- dev-lang/rust/rust-1.76.0-r101.ebuild | 9 ++++++--- dev-lang/rust/rust-1.77.1-r101.ebuild | 9 ++++++--- dev-lang/rust/rust-1.78.0-r101.ebuild | 7 +++++-- dev-lang/rust/rust-1.79.0-r101.ebuild | 7 +++++-- dev-lang/rust/rust-1.80.1-r101.ebuild | 7 +++++-- dev-lang/rust/rust-1.81.0-r101.ebuild | 4 ++-- dev-lang/rust/rust-1.82.0-r103.ebuild | 4 ++-- 10 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dev-lang/rust/files/1.74.1-cross-compile-libz.patch b/dev-lang/rust/files/1.74.1-cross-compile-libz.patch index f2a881b46134..98cec093d006 100644 --- a/dev-lang/rust/files/1.74.1-cross-compile-libz.patch +++ b/dev-lang/rust/files/1.74.1-cross-compile-libz.patch @@ -1,8 +1,6 @@ https://paste.sr.ht/~kchibisov/682321e0fd4a3ece4a4b7b71591896f5cd3cdb22 https://github.com/gentoo/gentoo/pull/35246#discussion_r1484525497 -diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs -index f606fa483ca..8a2e1c40e8b 100644 --- a/compiler/rustc_llvm/build.rs +++ b/compiler/rustc_llvm/build.rs @@ -237,10 +237,7 @@ fn main() { diff --git a/dev-lang/rust/rust-1.74.1-r101.ebuild b/dev-lang/rust/rust-1.74.1-r101.ebuild index 2a64f585f5a2..67485149b4d6 100644 --- a/dev-lang/rust/rust-1.74.1-r101.ebuild +++ b/dev-lang/rust/rust-1.74.1-r101.ebuild @@ -152,10 +152,13 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( - "${FILESDIR}"/1.74.1-cross-compile-libz.patch - "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.62.1-musl-dynamic-linking.patch "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch + "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}/1.81.0-backport-bug937164.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101766.patch" ) clear_vendor_checksums() { diff --git a/dev-lang/rust/rust-1.75.0-r101.ebuild b/dev-lang/rust/rust-1.75.0-r101.ebuild index a3beac3ffa62..3690aea32f0a 100644 --- a/dev-lang/rust/rust-1.75.0-r101.ebuild +++ b/dev-lang/rust/rust-1.75.0-r101.ebuild @@ -141,13 +141,14 @@ 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.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch - # This patch shouldn't be necessary for later versions of Rust because its - # code was backported from master. + "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch + "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}/1.81.0-backport-bug937164.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101766.patch" "${FILESDIR}"/1.75.0-handle-vendored-sources.patch + "${FILESDIR}"/1.75.0-musl-dynamic-linking.patch ) clear_vendor_checksums() { diff --git a/dev-lang/rust/rust-1.76.0-r101.ebuild b/dev-lang/rust/rust-1.76.0-r101.ebuild index 5700363b60d9..e0094a404e2c 100644 --- a/dev-lang/rust/rust-1.76.0-r101.ebuild +++ b/dev-lang/rust/rust-1.76.0-r101.ebuild @@ -141,11 +141,14 @@ 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.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch + "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}/1.81.0-backport-bug937164.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101766.patch" "${FILESDIR}"/1.75.0-handle-vendored-sources.patch + "${FILESDIR}"/1.75.0-musl-dynamic-linking.patch "${FILESDIR}"/1.76.0-loong-code-model.patch # remove for >=1.78.0 ) diff --git a/dev-lang/rust/rust-1.77.1-r101.ebuild b/dev-lang/rust/rust-1.77.1-r101.ebuild index c051e561f302..d3a88f3f17e8 100644 --- a/dev-lang/rust/rust-1.77.1-r101.ebuild +++ b/dev-lang/rust/rust-1.77.1-r101.ebuild @@ -141,10 +141,13 @@ 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.70.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch + "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}/1.81.0-backport-bug937164.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101766.patch" + "${FILESDIR}"/1.75.0-musl-dynamic-linking.patch "${FILESDIR}"/1.76.0-loong-code-model.patch # remove for >=1.78.0 ) diff --git a/dev-lang/rust/rust-1.78.0-r101.ebuild b/dev-lang/rust/rust-1.78.0-r101.ebuild index 60115fd8a0ea..adc1ab036c79 100644 --- a/dev-lang/rust/rust-1.78.0-r101.ebuild +++ b/dev-lang/rust/rust-1.78.0-r101.ebuild @@ -141,10 +141,13 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( - "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch + "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}/1.81.0-backport-bug937164.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101766.patch" "${FILESDIR}"/1.78.0-ignore-broken-and-non-applicable-tests.patch - "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch ) diff --git a/dev-lang/rust/rust-1.79.0-r101.ebuild b/dev-lang/rust/rust-1.79.0-r101.ebuild index e6712c4ba954..8a61200fdcd4 100644 --- a/dev-lang/rust/rust-1.79.0-r101.ebuild +++ b/dev-lang/rust/rust-1.79.0-r101.ebuild @@ -141,10 +141,13 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( - "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch + "${FILESDIR}"/1.67.0-doc-wasm.patch "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}/1.81.0-backport-bug937164.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101766.patch" "${FILESDIR}"/1.78.0-ignore-broken-and-non-applicable-tests.patch - "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch ) diff --git a/dev-lang/rust/rust-1.80.1-r101.ebuild b/dev-lang/rust/rust-1.80.1-r101.ebuild index 5171006930f8..e871cf82359f 100644 --- a/dev-lang/rust/rust-1.80.1-r101.ebuild +++ b/dev-lang/rust/rust-1.80.1-r101.ebuild @@ -141,9 +141,12 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( - "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch - "${FILESDIR}"/1.74.1-cross-compile-libz.patch "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}/1.81.0-backport-bug937164.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" + "${FILESDIR}/1.81.0-backport-llvm-pr101766.patch" + "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch ) diff --git a/dev-lang/rust/rust-1.81.0-r101.ebuild b/dev-lang/rust/rust-1.81.0-r101.ebuild index b7a1a5ba6855..7534c71c5151 100644 --- a/dev-lang/rust/rust-1.81.0-r101.ebuild +++ b/dev-lang/rust/rust-1.81.0-r101.ebuild @@ -142,9 +142,9 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( - "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch - "${FILESDIR}"/1.74.1-cross-compile-libz.patch "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.79.0-revert-8c40426.patch "${FILESDIR}/1.81.0-backport-bug937164.patch" "${FILESDIR}/1.81.0-backport-llvm-pr101761.patch" diff --git a/dev-lang/rust/rust-1.82.0-r103.ebuild b/dev-lang/rust/rust-1.82.0-r103.ebuild index ce51437d7531..96715a562188 100644 --- a/dev-lang/rust/rust-1.82.0-r103.ebuild +++ b/dev-lang/rust/rust-1.82.0-r103.ebuild @@ -141,9 +141,9 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc PATCHES=( - "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch - "${FILESDIR}"/1.74.1-cross-compile-libz.patch "${FILESDIR}"/1.67.0-doc-wasm.patch + "${FILESDIR}"/1.74.1-cross-compile-libz.patch + "${FILESDIR}"/1.78.0-musl-dynamic-linking.patch "${FILESDIR}"/1.82.0-dwarf-llvm-assertion.patch )
