From d87c46031435d1a2b8b5ecacefeda12cae4e206c Mon Sep 17 00:00:00 2001 From: jchzhou Date: Mon, 24 Apr 2023 19:10:15 +0800 Subject: [PATCH] Update to 1.69.0 --- rust.spec | 42 +++++++------- ....patch => rustc-1.69.0-disable-http2.patch | 56 ++++++++++--------- 2 files changed, 49 insertions(+), 49 deletions(-) rename rustc-1.67.1-disable-http2.patch => rustc-1.69.0-disable-http2.patch (75%) diff --git a/rust.spec b/rust.spec index b1de7a6..7be877e 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ -%global bootstrap_rust 1.67.1 -%global bootstrap_cargo 1.67.1 -%global bootstrap_channel 1.67.1 -%global bootstrap_date 2023-02-09 +%global bootstrap_rust 1.68.0 +%global bootstrap_cargo 1.68.0 +%global bootstrap_channel 1.68.0 +%global bootstrap_date 2023-03-09 %bcond_with llvm_static %bcond_with bundled_llvm %bcond_without bundled_libgit2 @@ -9,15 +9,15 @@ %bcond_without curl_http2 %bcond_without lldb Name: rust -Version: 1.68.0 +Version: 1.69.0 Release: 1 Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) URL: https://www.rust-lang.org -Source0: https://static.rust-lang.org/dist/rustc-%{version}-src.tar.gz +Source0: https://static.rust-lang.org/dist/rustc-%{version}-src.tar.xz Patch0000: rustc-1.65.0-disable-libssh2.patch -Patch0001: rustc-1.67.1-disable-http2.patch +Patch0001: rustc-1.69.0-disable-http2.patch Patch0002: clippy-driver-usage-should-user-friendly.patch Patch0003: cargo-help-clippy-should-have-description-to-user.patch Patch0004: fix-a-println-wrong-format.patch @@ -93,8 +93,9 @@ BuildRequires: cmake >= 2.8.11 %global llvm llvm15 %global llvm_root %{_prefix} %endif -BuildRequires: %{llvm} >= 13.0 -BuildRequires: %{llvm}-devel >= 13.0 +# rust currently requires llvm 14.0+ +BuildRequires: %{llvm} >= 14.0.0 +BuildRequires: %{llvm}-devel >= 14.0.0 %if %with llvm_static BuildRequires: %{llvm}-static libffi-devel %endif @@ -119,6 +120,10 @@ Requires: /usr/bin/cc %endif %global musl_root %{_prefix}/musl +# The 'analysis' component is removed since Rust 1.69.0 +# ref: https://github.com/rust-lang/rust/pull/101841 +Obsoletes: %{name}-analysis < 1.69.0~ + %description Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety. @@ -205,14 +210,6 @@ BuildArch: noarch This package includes source files for the Rust standard library. It may be useful as a reference for code completion tools in various editors. -%package analysis -Summary: Compiler analysis data for the Rust standard library -Requires: rust-std-static%{?_isa} = %{version}-%{release} -%description analysis -This package contains analysis data files produced with rustc's -Zsave-analysis -feature for the Rust standard library. The RLS (Rust Language Server) uses this -data to provide information about the Rust standard library. - %package help Summary: Help documents for rust @@ -308,7 +305,7 @@ fi --disable-rpath \ %{enable_debuginfo} \ --enable-extended \ - --tools=analysis,cargo,clippy,rls,rust-analyzer,rustfmt,src \ + --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \ --enable-vendor \ --enable-verbose-tests \ %{?codegen_units_std} \ @@ -444,10 +441,6 @@ export %{rust_env} %dir %{rustlibdir} %{rustlibdir}/src -%files analysis -%{rustlibdir}/%{rust_triple}/analysis/ -%{rustlibdir}/%{rust_musl_triple}/analysis/ - %files help %dir %{_docdir}/%{name} %docdir %{_docdir}/%{name} @@ -460,6 +453,11 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Mon Apr 24 2023 jchzhou - 1.69.0-1 +- Update to 1.69.0 +- Obsolete the removed rust-analysis subpackage +- Switch to xz tarball to save space + * Wed Mar 22 2023 wangkai - 1.68.0-1 - Update to 1.68.0 diff --git a/rustc-1.67.1-disable-http2.patch b/rustc-1.69.0-disable-http2.patch similarity index 75% rename from rustc-1.67.1-disable-http2.patch rename to rustc-1.69.0-disable-http2.patch index b74cb61..09e7930 100644 --- a/rustc-1.67.1-disable-http2.patch +++ b/rustc-1.69.0-disable-http2.patch @@ -1,6 +1,6 @@ ---- rustc-beta-src/Cargo.lock.orig 2023-01-24 13:25:47.822917185 -0800 -+++ rustc-beta-src/Cargo.lock 2023-01-24 13:25:47.824917142 -0800 -@@ -1062,7 +1062,6 @@ +--- rustc-beta-src/Cargo.lock.orig 2023-03-23 17:10:30.810989345 -0700 ++++ rustc-beta-src/Cargo.lock 2023-03-23 17:10:30.812989303 -0700 +@@ -1142,7 +1142,6 @@ dependencies = [ "cc", "libc", @@ -8,7 +8,7 @@ "libz-sys", "openssl-sys", "pkg-config", -@@ -2181,16 +2180,6 @@ +@@ -2375,16 +2374,6 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] @@ -22,23 +22,23 @@ -] - -[[package]] - name = "libssh2-sys" - version = "0.2.23" + name = "libz-sys" + version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-01-24 13:25:47.824917142 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-01-24 13:26:29.209044200 -0800 -@@ -21,7 +21,7 @@ - cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-03-23 17:10:30.812989303 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-03-23 17:11:26.242836664 -0700 +@@ -23,7 +23,7 @@ cargo-util = { path = "crates/cargo-util", version = "0.2.3" } - crates-io = { path = "crates/crates-io", version = "0.35.0" } + clap = "4.1.3" + crates-io = { path = "crates/crates-io", version = "0.36.0" } -curl = { version = "0.4.44", features = ["http2"] } +curl = { version = "0.4.44", features = [] } curl-sys = "0.4.59" env_logger = "0.10.0" - pretty_env_logger = { version = "0.4", optional = true } ---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2023-01-21 17:17:19.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2023-01-24 13:25:47.824917142 -0800 -@@ -403,16 +403,9 @@ + filetime = "0.2.9" +--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2023-03-19 00:20:55.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2023-03-23 17:10:30.812989303 -0700 +@@ -401,16 +401,9 @@ sources: SourceMap<'cfg>, config: &'cfg Config, ) -> CargoResult> { @@ -58,18 +58,9 @@ Ok(PackageSet { packages: package_ids -@@ -658,7 +651,7 @@ - macro_rules! try_old_curl { - ($e:expr, $msg:expr) => { - let result = $e; -- if cfg!(target_os = "macos") { -+ if cfg!(any(target_os = "linux", target_os = "macos")) { - if let Err(e) = result { - warn!("ignoring libcurl {} error: {}", $msg, e); - } ---- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig 2023-01-21 17:17:19.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs 2023-01-24 13:25:47.824917142 -0800 -@@ -223,16 +223,8 @@ +--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig 2023-03-19 00:20:55.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs 2023-03-23 17:10:30.813989282 -0700 +@@ -220,16 +220,8 @@ } self.fetch_started = true; @@ -88,3 +79,14 @@ self.config .shell() +--- rustc-beta-src/src/tools/cargo/src/cargo/util/network.rs.orig 2023-03-19 00:20:55.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/src/cargo/util/network.rs 2023-03-23 17:10:30.813989282 -0700 +@@ -116,7 +116,7 @@ + macro_rules! try_old_curl { + ($e:expr, $msg:expr) => { + let result = $e; +- if cfg!(target_os = "macos") { ++ if cfg!(any(target_os = "linux", target_os = "macos")) { + if let Err(e) = result { + warn!("ignoring libcurl {} error: {}", $msg, e); + }