diff options
| author | Matt Jolly <kangie@gentoo.org> | 2025-05-31 16:23:15 +1000 |
|---|---|---|
| committer | Matt Jolly <kangie@gentoo.org> | 2025-06-04 07:36:56 +1000 |
| commit | 057daa00036e040231855c45bc2bba039c29cb53 (patch) | |
| tree | 8039c2610a50790596fd79ac460c42cdbe762f1b /dev-lang/rust/rust-1.86.0-r2.ebuild | |
| parent | 388cbca2dd4f4826e9bb99f89b2bb1808e84de52 (diff) | |
| download | gentoo-057daa00036e040231855c45bc2bba039c29cb53.tar.gz gentoo-057daa00036e040231855c45bc2bba039c29cb53.tar.bz2 gentoo-057daa00036e040231855c45bc2bba039c29cb53.zip | |
dev-lang/rust: stop using FILESDIR
files/ has been too big for a while now. Instead use the rust-patches
repository that was created to manage these patches.
No revbumps required - they were either done beforehand when we dropped
a bad patch _or_ are not required as the only additions are backported
build-time fixes (done in previous commits).
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'dev-lang/rust/rust-1.86.0-r2.ebuild')
| -rw-r--r-- | dev-lang/rust/rust-1.86.0-r2.ebuild | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/dev-lang/rust/rust-1.86.0-r2.ebuild b/dev-lang/rust/rust-1.86.0-r2.ebuild index 8edc7bf68253..1c2a241fe42c 100644 --- a/dev-lang/rust/rust-1.86.0-r2.ebuild +++ b/dev-lang/rust/rust-1.86.0-r2.ebuild @@ -6,6 +6,8 @@ EAPI=8 LLVM_COMPAT=( 19 ) PYTHON_COMPAT=( python3_{10..13} ) +RUST_PATCH_VER=${PVR} + RUST_MAX_VER=${PV%%_*} if [[ ${PV} == *9999* ]]; then RUST_MIN_VER="1.85.0" # Update this as new `beta` releases come out. @@ -37,6 +39,7 @@ elif [[ ${PV} == *beta* ]]; then BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" MY_P="rustc-beta" SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz + https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2 verify-sig? ( https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc -> rustc-${PV}-src.tar.xz.asc ) " @@ -44,6 +47,7 @@ elif [[ ${PV} == *beta* ]]; then else MY_P="rustc-${PV}" SRC_URI="https://static.rust-lang.org/dist/${MY_P}-src.tar.xz + https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2 verify-sig? ( https://static.rust-lang.org/dist/${MY_P}-src.tar.xz.asc ) " S="${WORKDIR}/${MY_P}-src" @@ -171,13 +175,6 @@ RESTRICT="test" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc -PATCHES=( - "${FILESDIR}"/1.85.0-cross-compile-libz.patch - "${FILESDIR}"/1.85.0-musl-dynamic-linking.patch - "${FILESDIR}"/1.67.0-doc-wasm.patch - "${FILESDIR}"/1.86.0-znver.patch -) - clear_vendor_checksums() { sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die } @@ -303,9 +300,13 @@ pkg_setup() { src_prepare() { if [[ ${PV} = *9999* ]]; then # We need to update / generate lockfiles for the workspace - ${CARGO} generate-lockfile --offline + ${CARGO} generate-lockfile --offline || die "Failed to generate lockfiles" fi + PATCHES=( + "${WORKDIR}/rust-patches-${RUST_PATCH_VER}/" + ) + if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then export RUSTFLAGS+=" -C link-arg=-fuse-ld=lld" fi |