diff --git a/0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch b/0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch deleted file mode 100644 index 6806d2a..0000000 --- a/0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 35187c7e6474d346eea3113c4ae34d26d6b18756 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Tue, 22 Aug 2023 10:42:12 -0700 -Subject: [PATCH] Skip ExpandYamlAnchors when the config is missing - -The dist-src tarball does not include `.github/` at all, so we can't -check whether it needs to be regenerated. ---- - src/bootstrap/test.rs | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index db3b7ffbea4e..d1018978f78c 100644 ---- a/src/bootstrap/test.rs -+++ b/src/bootstrap/test.rs -@@ -1174,6 +1174,11 @@ impl Step for ExpandYamlAnchors { - /// appropriate configuration for all our CI providers. This step ensures the tool was called - /// by the user before committing CI changes. - fn run(self, builder: &Builder<'_>) { -+ // Note: `.github/` is not included in dist-src tarballs -+ if !builder.src.join(".github/workflows/ci.yml").exists() { -+ builder.info("Skipping YAML anchors check: GitHub Actions config not found"); -+ return; -+ } - builder.info("Ensuring the YAML anchors in the GitHub Actions config were expanded"); - builder.run_delaying_failure( - &mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("check").arg(&builder.src), --- -2.41.0 - diff --git a/0001-Use-lld-provided-by-system-for-wasm.patch b/0001-Use-lld-provided-by-system-for-wasm.patch deleted file mode 100644 index 5fcc245..0000000 --- a/0001-Use-lld-provided-by-system-for-wasm.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 37cb177eb53145103ae72b67562884782dde01c3 Mon Sep 17 00:00:00 2001 -From: Ivan Mironov -Date: Sun, 8 Dec 2019 17:23:08 +0500 -Subject: [PATCH] Use lld provided by system for wasm - ---- - compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs -index 528a84a8b37c..353d742161d1 100644 ---- a/compiler/rustc_target/src/spec/wasm_base.rs -+++ b/compiler/rustc_target/src/spec/wasm_base.rs -@@ -89,8 +89,7 @@ macro_rules! args { - // arguments just yet - limit_rdylib_exports: false, - -- // we use the LLD shipped with the Rust toolchain by default -- linker: Some("rust-lld".into()), -+ linker: Some("lld".into()), - linker_flavor: LinkerFlavor::WasmLld(Cc::No), - - pre_link_args, --- -2.38.1 - diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch new file mode 100644 index 0000000..dc1f1ba --- /dev/null +++ b/0001-Use-lld-provided-by-system.patch @@ -0,0 +1,53 @@ +From b6ca6a363a7c91136c723a21fda4816d3009e479 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Wed, 1 Nov 2023 15:21:15 -0700 +Subject: [PATCH] Use lld provided by system + +--- + compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- + compiler/rustc_target/src/spec/x86_64_unknown_none.rs | 2 +- + compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs | 1 + + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs +index 341763aadbaf..ee6358e72955 100644 +--- a/compiler/rustc_target/src/spec/wasm_base.rs ++++ b/compiler/rustc_target/src/spec/wasm_base.rs +@@ -89,8 +89,7 @@ macro_rules! args { + // arguments just yet + limit_rdylib_exports: false, + +- // we use the LLD shipped with the Rust toolchain by default +- linker: Some("rust-lld".into()), ++ linker: Some("lld".into()), + linker_flavor: LinkerFlavor::WasmLld(Cc::No), + + pre_link_args, +diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/x86_64_unknown_none.rs +index fe3b24f2d4af..1f1731d202ca 100644 +--- a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs ++++ b/compiler/rustc_target/src/spec/x86_64_unknown_none.rs +@@ -17,7 +17,7 @@ pub 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()), + features: + "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float" + .into(), +diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs +index 41ba768068a3..2eea4c76f1ca 100644 +--- a/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs ++++ b/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs +@@ -13,6 +13,7 @@ pub fn target() -> Target { + base.plt_by_default = false; + base.max_atomic_width = Some(64); + base.entry_abi = Conv::X86_64Win64; ++ base.linker = Some("lld".into()); + + // 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.41.0 + diff --git a/rust.spec b/rust.spec index 6f2a833..9e60621 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ -%global bootstrap_rust 1.72.0 -%global bootstrap_cargo 1.72.0 -%global bootstrap_channel 1.72.0 -%global bootstrap_date 2023-08-24 +%global bootstrap_rust 1.73.0 +%global bootstrap_cargo 1.73.0 +%global bootstrap_channel 1.73.0 +%global bootstrap_date 2023-10-05 %bcond_with llvm_static %bcond_with bundled_llvm %bcond_without bundled_libgit2 @@ -10,8 +10,8 @@ %bcond_without analyzer Name: rust -Version: 1.73.0 -Release: 2 +Version: 1.74.0 +Release: 1 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -23,17 +23,14 @@ Source3: cargo-config Source4: cargo-config.sh Source5: cargo-config.csh -Patch0000: rustc-1.73.0-disable-libssh2.patch +Patch0000: rustc-1.74.0-disable-libssh2.patch Patch0001: clippy-driver-usage-should-user-friendly.patch Patch0002: cargo-help-clippy-should-have-description-to-user.patch Patch0003: fix-a-println-wrong-format.patch -# The dist-src tarball doesn't include .github/ -# https://github.com/rust-lang/rust/pull/115109 -Patch0004: 0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch -# By default, rust tries to use "rust-lld" as a linker for WebAssembly. -Patch0005: 0001-Use-lld-provided-by-system-for-wasm.patch +# By default, rust tries to use "rust-lld" as a linker for some targets. +Patch0004: 0001-Use-lld-provided-by-system.patch # Set a substitute-path in rust-gdb for standard library sources. -Patch0006: rustc-1.70.0-rust-gdb-substitute-path.patch +Patch0005: rustc-1.70.0-rust-gdb-substitute-path.patch %{lua: function rust_triple(arch) local abi = "gnu" @@ -98,7 +95,7 @@ BuildRequires: pkgconfig(openssl) pkgconfig(zlib) pkgconfig(libssh2) >= 1. BuildRequires: %{python} %if %with bundled_llvm BuildRequires: cmake3 >= 3.13.4 -Provides: bundled(llvm) = 17.0.2 +Provides: bundled(llvm) = 17.0.4 %else BuildRequires: cmake >= 2.8.11 %if %defined llvm @@ -260,7 +257,6 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure %patch -P 0003 -p1 %patch -P 0004 -p1 %patch -P 0005 -p1 -%patch -P 0006 -p1 rm -rf vendor/curl-sys*/curl/ rm -rf vendor/jemalloc-sys/jemalloc/ rm -rf vendor/libffi-sys*/libffi/ @@ -488,6 +484,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Fri Nov 24 2023 wangkai <13474090681@163.com> - 1.74.0-1 +- Update to 1.74.0 + * Mon Nov 13 2023 wangkai <13474090681@163.com> - 1.73.0-2 - Remove git lfs tar and change to user-repo - Add gpg verification to Source0 diff --git a/rustc-1.73.0-disable-libssh2.patch b/rustc-1.73.0-disable-libssh2.patch deleted file mode 100644 index 96b5f4f..0000000 --- a/rustc-1.73.0-disable-libssh2.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-09-01 10:51:15.000000000 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-09-05 16:59:08.837345133 -0700 -@@ -1973,7 +1973,6 @@ - dependencies = [ - "cc", - "libc", -- "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -@@ -2006,20 +2005,6 @@ - ] - - [[package]] --name = "libssh2-sys" --version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" --dependencies = [ -- "cc", -- "libc", -- "libz-sys", -- "openssl-sys", -- "pkg-config", -- "vcpkg", --] -- --[[package]] - name = "libz-sys" - version = "1.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-09-05 16:59:08.837345133 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-09-05 17:00:00.828461993 -0700 -@@ -37,7 +37,7 @@ - filetime = "0.2.21" - flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] } - fwdansi = "1.1.0" --git2 = "0.17.2" -+git2 = { version = "0.17.2", default-features = false, features = ["https"] } - git2-curl = "0.18.0" - gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } - gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] } diff --git a/rustc-1.73.0-src.tar.xz.asc b/rustc-1.73.0-src.tar.xz.asc deleted file mode 100644 index e87b385..0000000 --- a/rustc-1.73.0-src.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -wsFcBAABCgAQBQJlHtp4CRCFq5bm+hvl/gAA840QAMg9zO72kHgjLJGuVQ4cJ/90 -LJWeN8daWRFk+UgaTB4cFQ8LG6gbPTUbTUw+4niwKcts+gxECnvsM8Vwazj+KmrK -4vay9656/JMt3HffRSkZtTRKctQs5ehkpoOf39AA6TgZ7N+OL0keZrsNBFcMOtle -4T3S5OD2PlmIP0rQVPg/XhTi5Ud7fZ2D9OIY9JWY/ezc3KzDjSoodrmdgMT1Qom5 -rg6umXYcrO/HYm2+np8+2Dg94ieJsJ+ff99PsG9STTSO7oUWKu1Cwfj+QaZvcuCy -KK/fbUjsoQBWw2ktVUao7xx6vqQUBWAHYsjdZPkgiESa/3bo/brA0ZzPNv7d6/N7 -cbv4FxkJ6yd4AHleRFYxwvwVgGKEYko1v0nM8F7vv+z+k0F1ybJiejRVI+0Zdi2I -Kn0RwNSsPwQxoWdcRu8kCQTigZ1QfGYYxbuR1nQafw0tFS7sWxryhNdNCcdyXMaD -757AcaGAiOs4r7VgS2OGgxbXQjsbcTTtYaVepSiLAzyzNiL4dTz7/yTlwQ/2Iy+5 -ytWCrVClu5t6Ig9a2hSmJvNwxaEMZc5GTeMgn9UfGBZRJY7I0yeCq9/pNkv6AFVX -fNJD0Q4a60KUSa/iwWC7/Ng/AdrRZgPUDWy2XgHmJLhobCgxRmsJcwtfyDj/JLb2 -d8MIqfG/SiDhlwXTZhPB -=KHAA ------END PGP SIGNATURE----- diff --git a/rustc-1.74.0-disable-libssh2.patch b/rustc-1.74.0-disable-libssh2.patch new file mode 100644 index 0000000..81c30b4 --- /dev/null +++ b/rustc-1.74.0-disable-libssh2.patch @@ -0,0 +1,42 @@ +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-10-20 22:31:52.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-11-01 15:33:13.224745542 -0700 +@@ -2009,7 +2009,6 @@ + dependencies = [ + "cc", + "libc", +- "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +@@ -2042,20 +2041,6 @@ + ] + + [[package]] +-name = "libssh2-sys" +-version = "0.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +-dependencies = [ +- "cc", +- "libc", +- "libz-sys", +- "openssl-sys", +- "pkg-config", +- "vcpkg", +-] +- +-[[package]] + name = "libz-sys" + version = "1.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-11-01 15:33:13.225745528 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-11-01 15:34:51.883397544 -0700 +@@ -40,7 +40,7 @@ + curl-sys = "0.4.68" + filetime = "0.2.22" + flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] } +-git2 = "0.18.0" ++git2 = { version = "0.18.0", default-features = false, features = ["https"] } + git2-curl = "0.19.0" + gix = { version = "0.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } + gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] } diff --git a/rustc-1.74.0-src.tar.xz.asc b/rustc-1.74.0-src.tar.xz.asc new file mode 100644 index 0000000..8313ae0 --- /dev/null +++ b/rustc-1.74.0-src.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFcBAABCgAQBQJlVhZpCRCFq5bm+hvl/gAAoEcP/RnTbzU3dwTRRm/KD403G2CV +4O67vVPlv+ofLzVJvLqiiHuX9nZvYdZ7bbS6AYYj+Sr4bek/L61/Op3tJL+Qmam+ +f5s10qluNR4wmzQw/sx/m80YqspvluKJPkzPgYvU2fN/nrvJpvYCd+aMz3HRmePL +y/bIw7I7Foqzn6FJ4DeNLQddw0BTGyAVsEQnCYUUnpvCXKMzQkjPQTesSKYmQ++H +C1TdNVkg1+x/iS5rOi/nquX0vIhDV0BhVAi5V0CNcons6OmVs+l/frJyqwVaMHHu +0e2X3lWojWzaWcWC/OyTmLTMUHgUh0boRDL28ZiZTmnsSjPaZh9q8yirPSyUzYEL +gmui4g1ID3M3lNjKyCJJhI8Mn+WlJp6mnnF8QA9D/h9zhfPpP7Ie9JLdJM8T1kxs +2MOS/DPxm8oUOXvNC2kgZKeU2iGmN91MwMQ1oF7wOANJsXXZ1ujPA5GAKBH3aIKg +bht3AOPfu1iBsrj+iidhaVQ9Y+zlg9dvUX+9evc8AUhr4sHHNc3FwMeq0SncnZyG +bzPAoeXVkSAokOlOK4XBdPkHN+9QfGl3b8n6WfORcHhmbWwU+Cx9bMkD6EbaUsKu +fUY1jSmvMaBHKpj1Aq9olgvslQYnEeqkdvx8LwR3ZKO3CSt8I/DmW607ATFroU6O +gEGIny1kghs+mCvPFimL +=7+Ln +-----END PGP SIGNATURE-----