commit: a33ed9ed8bcacd8db1b90d7b279777d50962649c Author: Michal Rostecki <vadorovsky <AT> protonmail <DOT> com> AuthorDate: Tue Nov 4 18:31:48 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 5 17:19:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33ed9ed
dev-lang/rust: Add patch fixing bootstrap of Rust 1.90.0 with 1.90.0 Bug: https://bugs.gentoo.org/963657 Signed-off-by: Michal Rostecki <vadorovsky <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44468 Closes: https://github.com/gentoo/gentoo/pull/44468 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/rust/Manifest | 2 +- dev-lang/rust/rust-1.90.0-r1.ebuild | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 3ecab9d4c1bb..a4fda1e1b772 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -16,7 +16,7 @@ DIST rust-patches-1.86.0-r2-1.tar.bz2 6308 BLAKE2B eca644026942bd729a748df57dd67 DIST rust-patches-1.87.0-r1-1.tar.bz2 5116 BLAKE2B 783ad21464a7e393d0aee506119be12b0137a7d360402b74f36b6fde154c2804cc0779da63875977d09f7e9f2d273ff41dd189bbe4eb239a314fea27bbaa704c SHA512 8c67e4e43bf2afb226f70bb2a03aad0abfd525cd484c8c9ff663da06d63b471f4f1b48169d952a6a6c14258c0029dedea14aadaaca2ee75389df65b806188363 DIST rust-patches-1.88.0.tar.bz2 4062 BLAKE2B 64168ffa608f2edf2e0b3d079152c3b5dd59d0cea29078894f286bf91488e2e7769c55ede2d43769368d2147b46699d1bf981190d6800dc3d41c736289122eaf SHA512 b565acfb4d1146e52b1fb66b4a242927407cc34f1b38c2a100135cbbde24c8374af1997bc22069cca25f33cc8d747e56391f3d98a2d4e13dc0abcec0d6f88b0b DIST rust-patches-1.89.0.tar.bz2 4091 BLAKE2B 0fea3488a39d2b00627084f6b192dfbd7ed49bdceabbb1141d1a849ba053f786e31115e00365679b1b6fb5b0ccdf5dc0dc0803057cbffbcf0ae3d75ae9830d94 SHA512 de6c9b693bdd719d06605b5da730ee5d9cf9a1d88d58194a0ba48bd378a951c66723f561e39181222d28abb38e974a2921e14ea1f40156caf7b903778cf65790 -DIST rust-patches-1.90.0.tar.bz2 4183 BLAKE2B e6cc7516bd386c020be208e9931221edb301a94b6b5cf8140d68ddd5e13b1ddaaa53b52b4b7b039faf2a7caf44107f170afb01e15ac7487c6fe5146feff3789b SHA512 0cbf6dd9fc8b68e265dd146423c82c72bccf1ef7f81c5bab87c5d53dda1ecce80ffad361f2c276ab713616847126c277af7b1e48327d433f6202361e25cf5201 +DIST rust-patches-1.90.0_p1.tar.bz2 6095 BLAKE2B d94899021a2ad0bd2de00c15a04b6a5437fa156f7a1b0b18d31e9487312004dfb2d9cb487eacd30592066ef168e088608bd4fc0c7e383c2fe5ec0a8bfd666b0b SHA512 351ea7dcdea3767b7affe40dc3d2684b7fc56cd0dcd06a6feb86ecb5d62d0451083fae20f878eb1a04c0f8cb31c6f7c96cb5bc84fc22844328fbcfcdf0ae03fb DIST rust-patches-1.91.0.tar.bz2 6041 BLAKE2B 7ebc846e0ae7b496b4ed89a8b0a5c397923e4dd6c83a1289e0b98f57477feea35978224b9c4ae19a129282a8c53bdd68f8ab615821f62e4bb5fda8e39b03eeb9 SHA512 fee179ec4e4c90aacfc7f8de2b4d41c80472e1fee17dbfc5ebf384d0fb8ec5afb3f8110a429abaf5a74a924fd1926ab69b29d1b2bafd3b5014b2ad360ca24cce DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3 SHA512 14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d DIST rustc-1.74.1-src.tar.xz.asc 801 BLAKE2B ddf73175b164233babf31ca3a381b03e20c0f36d017c1d5f85d6ab11f0986d861ab23b11c061e6b2444ced70c3d6a494cc3de4ec86f0deb221a805491bd75420 SHA512 9a96ff9ba9a4e2af4e267b2ec126fc0675c78d0eb767703daa2f28491c3d85c2ab00fbd8584390bf658812ec6c4ab6c57e43b386db59fd505bd3134a8873a09e diff --git a/dev-lang/rust/rust-1.90.0-r1.ebuild b/dev-lang/rust/rust-1.90.0-r1.ebuild index 481f6ad477b8..da1dca06e5d7 100644 --- a/dev-lang/rust/rust-1.90.0-r1.ebuild +++ b/dev-lang/rust/rust-1.90.0-r1.ebuild @@ -6,7 +6,10 @@ EAPI=8 LLVM_COMPAT=( 20 ) PYTHON_COMPAT=( python3_{11..14} ) -RUST_PATCH_VER=${PV} +# We bumped the rust-patches tag without bumping the revision for +# https://bugs.gentoo.org/963657, given that ithe patch affects only a +# specific use case (bootstrap with Rust 1.90.0). +RUST_PATCH_VER=${PV}_p1 RUST_MAX_VER=${PV%%_*} if [[ ${PV} == *9999* ]]; then @@ -332,6 +335,13 @@ src_prepare() { PATCHES=( "${WORKDIR}/rust-patches-${RUST_PATCH_VER}/" ) + # Apply patches for bootstrapping with a particular Rust version (RUST_SLOT). + local bootstrap_patchdir="${WORKDIR}/rust-patches-${RUST_PATCH_VER}/${RUST_SLOT}" + if [[ -d "${bootstrap_patchdir}" ]]; then + PATCHES+=( + "${bootstrap_patchdir}" + ) + fi if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld"
