From b6ecb0fa2d5ab95cb00855f9cd74f416df0fec6e Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Mon, 7 Apr 2025 10:14:25 +0800 Subject: [PATCH] Update to 1.86.0 --- 0001-Use-lld-provided-by-system.patch | 24 ++++++------- 0001-add-support-for-ppc64le.patch | 6 ++-- ...st-1.85.0-aarch64-unknown-linux-gnu.tar.xz | 4 +-- ....85.0-loongarch64-unknown-linux-gnu.tar.xz | 4 +-- ...-1.85.0-riscv64gc-unknown-linux-gnu.tar.xz | 4 +-- ...ust-1.85.0-x86_64-unknown-linux-gnu.tar.xz | 4 +-- rust.spec | 18 ++++++---- rustc-1.85.1-src.tar.xz | 3 -- rustc-1.85.1-src.tar.xz.asc | 16 --------- ...atch => rustc-1.86.0-disable-libssh2.patch | 34 +++++++++---------- rustc-1.86.0-src.tar.xz | 3 ++ rustc-1.86.0-src.tar.xz.asc | 16 +++++++++ 12 files changed, 71 insertions(+), 65 deletions(-) rename rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz => rust-1.85.0-aarch64-unknown-linux-gnu.tar.xz (32%) rename rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz => rust-1.85.0-loongarch64-unknown-linux-gnu.tar.xz (32%) rename rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz => rust-1.85.0-riscv64gc-unknown-linux-gnu.tar.xz (32%) rename rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz => rust-1.85.0-x86_64-unknown-linux-gnu.tar.xz (32%) delete mode 100644 rustc-1.85.1-src.tar.xz delete mode 100644 rustc-1.85.1-src.tar.xz.asc rename rustc-1.85.0-disable-libssh2.patch => rustc-1.86.0-disable-libssh2.patch (43%) create mode 100644 rustc-1.86.0-src.tar.xz create mode 100644 rustc-1.86.0-src.tar.xz.asc diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch index 063d66a..63c9b14 100644 --- a/0001-Use-lld-provided-by-system.patch +++ b/0001-Use-lld-provided-by-system.patch @@ -1,4 +1,4 @@ -From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 Mon Sep 17 00:00:00 2001 +From 687112c89c9058ef1e79f1c3a974940b1ae43ea3 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 16 Aug 2024 10:12:58 -0700 Subject: [PATCH] Use lld provided by system @@ -12,7 +12,7 @@ Subject: [PATCH] Use lld provided by system 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs -index f237391016e7..08bcd9699b4a 100644 +index 81b96cd39ffa..4c9916af826b 100644 --- a/compiler/rustc_target/src/spec/base/wasm.rs +++ b/compiler/rustc_target/src/spec/base/wasm.rs @@ -85,8 +85,7 @@ macro_rules! args { @@ -26,10 +26,10 @@ index f237391016e7..08bcd9699b4a 100644 pre_link_args, diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs -index 222d5651b521..4b780bc8a8e7 100644 +index 3b719ebaf07e..8b4fecee68f0 100644 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs -@@ -14,7 +14,7 @@ pub fn target() -> Target { +@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target { let opts = TargetOptions { abi: "softfloat".into(), linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), @@ -39,10 +39,10 @@ index 222d5651b521..4b780bc8a8e7 100644 relocation_model: RelocModel::Static, disable_redzone: true, diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs -index 429303170b6b..19d4ec53f6d8 100644 +index 9656024ddaa1..2099fa17229f 100644 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs -@@ -9,6 +9,7 @@ pub fn target() -> Target { +@@ -9,6 +9,7 @@ pub(crate) fn target() -> Target { base.max_atomic_width = Some(128); base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]); base.features = "+v8a".into(); @@ -51,23 +51,23 @@ index 429303170b6b..19d4ec53f6d8 100644 Target { llvm_target: "aarch64-unknown-windows".into(), diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs -index 549706998d46..b7e9158ddef5 100644 +index e14a36735894..b493d7d98b46 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs -@@ -17,7 +17,7 @@ pub fn target() -> Target { +@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target { static_position_independent_executables: true, relro_level: RelroLevel::Full, linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), - linker: Some("rust-lld".into()), + linker: Some("lld".into()), + rustc_abi: Some(RustcAbi::X86Softfloat), features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(), supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS, - disable_redzone: true, diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs -index 6da1fcca58c8..c84ae44576d4 100644 +index bce6aa0ebc6b..7fa1148a1de7 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs -@@ -16,6 +16,7 @@ pub fn target() -> Target { +@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target { base.plt_by_default = false; base.max_atomic_width = Some(64); base.entry_abi = Conv::X86_64Win64; @@ -76,5 +76,5 @@ index 6da1fcca58c8..c84ae44576d4 100644 // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to // enable these CPU features explicitly before their first use, otherwise their instructions -- -2.46.0 +2.48.1 diff --git a/0001-add-support-for-ppc64le.patch b/0001-add-support-for-ppc64le.patch index 91289e3..36e20a3 100644 --- a/0001-add-support-for-ppc64le.patch +++ b/0001-add-support-for-ppc64le.patch @@ -146,10 +146,10 @@ index 1ef018081..44308dcdc 100644 "riscv64gc-unknown-linux-gnu" => "linux-generic64", "s390x-unknown-linux-gnu" => "linux64-s390x", "s390x-unknown-linux-musl" => "linux64-s390x", -diff --git a/vendor/target-lexicon-0.12.16/src/targets.rs b/vendor/target-lexicon-0.12.16/src/targets.rs +diff --git a/vendor/target-lexicon-0.13.1/src/targets.rs b/vendor/target-lexicon-0.13.1/src/targets.rs index 997c673e6..439899f67 100644 ---- a/vendor/target-lexicon-0.12.16/src/targets.rs -+++ b/vendor/target-lexicon-0.12.16/src/targets.rs +--- a/vendor/target-lexicon-0.13.1/src/targets.rs ++++ b/vendor/target-lexicon-0.13.1/src/targets.rs @@ -1701,6 +1701,9 @@ mod tests { "powerpc64le-unknown-freebsd", "powerpc64le-unknown-linux-gnu", diff --git a/rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz b/rust-1.85.0-aarch64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz rename to rust-1.85.0-aarch64-unknown-linux-gnu.tar.xz index 30844a8..1b1516a 100644 --- a/rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz +++ b/rust-1.85.0-aarch64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c535d4eb461a361fcaaad98ce578b5846e1a0bd3ff6939874a3e9cbe72cfae17 -size 241841868 +oid sha256:024918027c349bd237617a8a1207d7c4462f70549a31e8bf6c14b0601cfd489e +size 241942608 diff --git a/rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz b/rust-1.85.0-loongarch64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz rename to rust-1.85.0-loongarch64-unknown-linux-gnu.tar.xz index 985b2ab..3580815 100644 --- a/rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz +++ b/rust-1.85.0-loongarch64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08bbf2dced82481edfe7d14ab170f90dc7e326511f39641eb8c428b1376d2990 -size 234981212 +oid sha256:a3d4a9a61cc903dd71f88ee730cf0ee4de7f55f38387bb6034925858be4dad11 +size 234279384 diff --git a/rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz b/rust-1.85.0-riscv64gc-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz rename to rust-1.85.0-riscv64gc-unknown-linux-gnu.tar.xz index 756b4b5..6ca0c99 100644 --- a/rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz +++ b/rust-1.85.0-riscv64gc-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74e0a75cb6d48975c75cf49b5434c921d6bed16937e1f6091eaffb524761c6e1 -size 221099540 +oid sha256:dcdbc9ed172c92b6e55e8c2fc08eca8f14b3d584f54c080170c0390a4d527350 +size 222050624 diff --git a/rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz b/rust-1.85.0-x86_64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz rename to rust-1.85.0-x86_64-unknown-linux-gnu.tar.xz index 87f6f3c..748a676 100644 --- a/rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz +++ b/rust-1.85.0-x86_64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73aca7e08720b7bf28beee8f2370c6aef961aa87e9674989f5ce62ec2f95dcfd -size 183288052 +oid sha256:6f8b323ed2a34ccf0031631b85d79e1133da662094566bc910432da9bd3a5b42 +size 182464920 diff --git a/rust.spec b/rust.spec index 9c540ae..8b6eef7 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ -%global bootstrap_rust 1.84.0 -%global bootstrap_cargo 1.84.0 -%global bootstrap_channel 1.84.0 -%global bootstrap_date 2025-01-09 +%global bootstrap_rust 1.85.0 +%global bootstrap_cargo 1.85.0 +%global bootstrap_channel 1.85.0 +%global bootstrap_date 2025-02-20 %global bootstrap_arches x86_64 aarch64 riscv64 %bcond_with llvm_static %ifarch x86_64 aarch64 riscv64 @@ -25,7 +25,7 @@ %endif Name: rust -Version: 1.85.1 +Version: 1.86.0 Release: 1 Summary: The Rust Programming Language License: Apache-2.0 OR MIT @@ -38,7 +38,7 @@ Source3: cargo-config Source4: cargo-config.sh Source5: cargo-config.csh -Patch0000: rustc-1.85.0-disable-libssh2.patch +Patch0000: rustc-1.86.0-disable-libssh2.patch # By default, rust tries to use "rust-lld" as a linker for some targets. Patch0001: 0001-Use-lld-provided-by-system.patch # Set a substitute-path in rust-gdb for standard library sources. @@ -466,6 +466,8 @@ export %{rust_env} %files %license COPYRIGHT LICENSE-APACHE LICENSE-MIT %license %{_pkgdocdir}/html/*.txt +%license %{_pkgdocdir}/COPYRIGHT.html +%license %{_pkgdocdir}/licenses/ %doc README.md %{_bindir}/rustc %{_bindir}/rustdoc @@ -483,6 +485,7 @@ export %{rust_env} %endif %files std-static +%license %{_pkgdocdir}/COPYRIGHT-library.html %dir %{rustlibdir} %dir %{rustlibdir}/%{rust_triple} %dir %{rustlibdir}/%{rust_triple}/lib @@ -560,6 +563,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Mon Apr 07 2025 wangkai <13474090681@163.com> - 1.86.0-1 +- Update to 1.86.0 + * Tue Apr 01 2025 wangkai <13474090681@163.com> - 1.85.1-1 - Update to 1.85.1 diff --git a/rustc-1.85.1-src.tar.xz b/rustc-1.85.1-src.tar.xz deleted file mode 100644 index 081a8f1..0000000 --- a/rustc-1.85.1-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1fbf809efe9f036939401e142631c201a53bcf43ec1696bd9f5290ba236a266 -size 274028992 diff --git a/rustc-1.85.1-src.tar.xz.asc b/rustc-1.85.1-src.tar.xz.asc deleted file mode 100644 index baa4768..0000000 --- a/rustc-1.85.1-src.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -wsFcBAABCgAQBQJn2armCRCFq5bm+hvl/gAAitUP/2+xphd62tVBLMvuhCn7ceW0 -aO/vtsDMsYieEIC1CyRNzfVUh3W7Sr978XLuZ84K5I0CmvCW4xI2x3XA29VxTGLl -cryqYSf7bshtjvRumzQRZ/2vuK+e9UhY0FH9Dwqb+o9/pivKN1m91PY9OFNoSL64 -s0W/vDmvGL2h5qTQ//EYq28sEmOiajXRcU5xsb1RJq0Xrlf6VmZrinNi37M3Qz/4 -AI77CXCXKVmtbhFXOcVbrN5V/RHmW/IB/G3WXL9482csLb5E0zSmrfXrtCSZk6OU -QXwNYe/eFyTEuVNSlJuWFnt24y0SjZx83jPasau3ima4cQP+z2azk2wzcOK/YPzG -95ZPYAzuVW/eSCa6q62SwDc6HYUC5HgyYzpK+HWvs6/BPqcRD19BtlrjtkcAr7ku -555tnSG5MlJr6r2A16xhIRJ/yMh5SstD9XzCXDt+Fq1RsYybIABbeaJ2ZnSxjaa8 -0PmkhKjgQ7SGWf/K0t7btfpbFvblls/9WVwguOcVZfYfi8u6j/ynSerkyznP394G -AYhh0Re4GoUa3SLlyLmWH/2dMOSn8J69G7E/IfpX+uVaUAofoQIjoxdO6l69l5jX -dbZk0sD1rD4zQRdiZVU3a9r/PcOuqbq+9ImSLL+Bhivn8paFWDtFuz9gXlHlsoLP -xgnKls+YzGWbvE0U2xvf -=714L ------END PGP SIGNATURE----- diff --git a/rustc-1.85.0-disable-libssh2.patch b/rustc-1.86.0-disable-libssh2.patch similarity index 43% rename from rustc-1.85.0-disable-libssh2.patch rename to rustc-1.86.0-disable-libssh2.patch index 09be945..8b07bde 100644 --- a/rustc-1.85.0-disable-libssh2.patch +++ b/rustc-1.86.0-disable-libssh2.patch @@ -1,7 +1,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-01-17 14:26:49.845587361 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-01-17 14:26:49.848587324 -0800 -@@ -2296,7 +2296,6 @@ checksum = "10472326a8a6477c3c20a64547b0 +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-03-11 15:36:38.387335541 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-03-11 15:39:27.491711044 -0700 +@@ -2528,7 +2528,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c dependencies = [ "cc", "libc", @@ -9,16 +9,16 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "libz-sys", "openssl-sys", "pkg-config", -@@ -2337,20 +2336,6 @@ dependencies = [ +@@ -2574,20 +2573,6 @@ dependencies = [ "pkg-config", "vcpkg", ] - -[[package]] -name = "libssh2-sys" --version = "0.3.0" +-version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9" -dependencies = [ - "cc", - "libc", @@ -31,14 +31,14 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools [[package]] name = "libz-sys" diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-01-17 14:26:49.848587324 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-01-17 14:27:49.035844397 -0800 -@@ -47,7 +47,7 @@ curl = "0.4.46" - curl-sys = "0.4.73" - filetime = "0.2.23" - flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] } --git2 = "0.19.0" -+git2 = { version = "0.19.0", default-features = false, features = ["https"] } - git2-curl = "0.20.0" - gix = { version = "0.69.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } - glob = "0.3.1" +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-03-11 15:36:38.389045348 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-03-11 15:38:36.948228456 -0700 +@@ -47,7 +47,7 @@ curl = "0.4.47" + curl-sys = "0.4.79" + filetime = "0.2.25" + flate2 = { version = "1.0.35", default-features = false, features = ["zlib"] } +-git2 = "0.20.0" ++git2 = { version = "0.20.0", default-features = false, features = ["https"] } + git2-curl = "0.21.0" + gix = { version = "0.70.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } + glob = "0.3.2" diff --git a/rustc-1.86.0-src.tar.xz b/rustc-1.86.0-src.tar.xz new file mode 100644 index 0000000..bf827fc --- /dev/null +++ b/rustc-1.86.0-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d939eada065dc827a9d4dbb55bd48533ad14c16e7f0a42e70147029c82a7707b +size 275696736 diff --git a/rustc-1.86.0-src.tar.xz.asc b/rustc-1.86.0-src.tar.xz.asc new file mode 100644 index 0000000..de2eb95 --- /dev/null +++ b/rustc-1.86.0-src.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFcBAABCgAQBQJn7lKhCRCFq5bm+hvl/gAACjYP/3bTkeFsXeV3GMKpAjVhRDfS +ni34+892i/suOodusQsj2l5dvOfWAcn2/X1iMezcZe3xk6gCsZ66GSwEGOQIhe/R +ooxUS2fg/w8wXsTxN2epmyd/pOVURUP7Ng+iSUP0ezfGX4q5ohmGw6SdfhsUzrJG +DROIEbLuHm0coB/RYFcGL5EhvtTc8TqEHkhemLg5z31tibuhyArOOcEY0GrNrj9s +g9rBcN6CxlxT7e6HDvjCWRFv9Fe+PJi+AvkTDjLDpothGuoyTqTzUDpu3kbtuK0p +kvIBRjcMfEXyA7qSogjQzViSVtgRwf029k7uMkNjPBPX+nS0NMlbD4jEXhqdNgM5 +6em7FMdYY2K+vFONBnR9smRPG/l+RswLkujAdMPCe2/KcTfRZ+m9GJpnwBeMMhxt +dOGYPPDImFJbVFu6uVN418qbcz9FBi/xLGhmcbR2dltqLRnVSuiAbYJM4dYLqlGo +fGkiidVMR6Qlwr++K7Ymv5bLmCELcJU2dK/kULrSTLhdO/2tEbiQgnxf03xCkkj5 +5jr5yF8LRGBhhnUZFX49W4dm1ipfZY5EHYvbbKrdQvo2Gyr2NaoXsuL4RGulYqLI +2fIQSCFnqT1ZMYYG7MkOQBQmRfDnv91MWUUAKRMhNMNBL1HVkRWs/YXlc54UgMbR +at0CKU1M2+OFY7ldicrc +=SPYv +-----END PGP SIGNATURE----- -- Gitee