packages/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.58.1

Browse Source
This commit is contained in:
Liu Zixian 2022-02-27 23:34:12 +08:00
parent a0230e59cb
commit 25185aac43
6 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cargo-help-clippy-should-have-description-to-user.patch
View File

@ -11,7 +11,7 @@ diff --git a/src/tools/cargo/src/bin/cargo/cli.rs b/src/tools/cargo/src/bin/carg
index 243f6ac0..c2dd8785 100644 index 243f6ac0..c2dd8785 100644
--- a/src/tools/cargo/src/bin/cargo/cli.rs --- a/src/tools/cargo/src/bin/cargo/cli.rs
+++ b/src/tools/cargo/src/bin/cargo/cli.rs +++ b/src/tools/cargo/src/bin/cargo/cli.rs
@@ -92,7 +92,12 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'" @@ -135,7 +135,12 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'",
} else if is_verbose { } else if is_verbose {
drop_println!(config, " {:<20} {}", name, path.display()); drop_println!(config, " {:<20} {}", name, path.display());
} else { } else {

2
clippy-driver-usage-should-user-friendly.patch
View File

@ -11,7 +11,7 @@ diff --git a/src/tools/clippy/src/driver.rs b/src/tools/clippy/src/driver.rs
index f5f6c09e..7af74f15 100644 index f5f6c09e..7af74f15 100644
--- a/src/tools/clippy/src/driver.rs --- a/src/tools/clippy/src/driver.rs
+++ b/src/tools/clippy/src/driver.rs +++ b/src/tools/clippy/src/driver.rs
@@ -95,7 +95,7 @@ fn display_help() { @@ -126,7 +126,7 @@ fn display_help() {
Checks a package to catch common mistakes and improve your Rust code. Checks a package to catch common mistakes and improve your Rust code.
Usage: Usage:

2
fix-a-println-wrong-format.patch
View File

@ -11,7 +11,7 @@ diff --git a/src/tools/cargo/src/bin/cargo/cli.rs b/src/tools/cargo/src/bin/carg
index c2dd8785..9c240690 100644 index c2dd8785..9c240690 100644
--- a/src/tools/cargo/src/bin/cargo/cli.rs --- a/src/tools/cargo/src/bin/cargo/cli.rs
+++ b/src/tools/cargo/src/bin/cargo/cli.rs +++ b/src/tools/cargo/src/bin/cargo/cli.rs
@@ -94,7 +94,7 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'" @@ -137,7 +137,7 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'",
} else { } else {
if name.as_str() == "clippy" { if name.as_str() == "clippy" {
let summary = "Checks a package to catch common mistakes and improve your Rust code."; let summary = "Checks a package to catch common mistakes and improve your Rust code.";

24
rust.spec
View File

@ -1,9 +1,9 @@
%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x %global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
%{!?channel: %global channel stable} %{!?channel: %global channel stable}
%global bootstrap_rust 1.56.0 %global bootstrap_rust 1.57.0
%global bootstrap_cargo 1.56.0 %global bootstrap_cargo 1.57.0
%global bootstrap_channel 1.56.0 %global bootstrap_channel 1.57.0
%global bootstrap_date 2022-01-22 %global bootstrap_date 2022-02-27
%bcond_with llvm_static %bcond_with llvm_static
%bcond_with bundled_llvm %bcond_with bundled_llvm
%bcond_without bundled_libgit2 %bcond_without bundled_libgit2
@ -11,8 +11,8 @@
%bcond_without curl_http2 %bcond_without curl_http2
%bcond_without lldb %bcond_without lldb
Name: rust Name: rust
Version: 1.57.0 Version: 1.58.1
Release: 2 Release: 1
Summary: The Rust Programming Language Summary: The Rust Programming Language
License: (ASL 2.0 or MIT) and (BSD and MIT) License: (ASL 2.0 or MIT) and (BSD and MIT)
URL: https://www.rust-lang.org URL: https://www.rust-lang.org
@ -24,8 +24,8 @@ ExclusiveArch: %{rust_arches}
%endif %endif
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.gz Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.gz
Patch0000: rustc-1.56.0-disable-libssh2.patch Patch0000: rustc-1.58.1-disable-libssh2.patch
Patch0001: rustc-1.56.0-disable-http2.patch Patch0001: rustc-1.58.1-disable-http2.patch
Patch0002: clippy-driver-usage-should-user-friendly.patch Patch0002: clippy-driver-usage-should-user-friendly.patch
Patch0003: cargo-help-clippy-should-have-description-to-user.patch Patch0003: cargo-help-clippy-should-have-description-to-user.patch
Patch0004: fix-a-println-wrong-format.patch Patch0004: fix-a-println-wrong-format.patch
@ -96,8 +96,8 @@ BuildRequires: cmake >= 2.8.11
%global llvm llvm %global llvm llvm
%global llvm_root %{_prefix} %global llvm_root %{_prefix}
%endif %endif
BuildRequires: %{llvm} >= 9.0 BuildRequires: %{llvm} >= 12.0
BuildRequires: %{llvm}-devel >= 9.0 BuildRequires: %{llvm}-devel >= 12.0
%if %with llvm_static %if %with llvm_static
BuildRequires: %{llvm}-static libffi-devel BuildRequires: %{llvm}-static libffi-devel
%endif %endif
@ -393,6 +393,7 @@ export %{rust_env}
%{rustlibdir}/%{rust_musl_triple}/lib/*.rlib %{rustlibdir}/%{rust_musl_triple}/lib/*.rlib
%{rustlibdir}/%{rust_musl_triple}/lib/self-contained/*.o %{rustlibdir}/%{rust_musl_triple}/lib/self-contained/*.o
%{rustlibdir}/%{rust_musl_triple}/lib/self-contained/libunwind.a %{rustlibdir}/%{rust_musl_triple}/lib/self-contained/libunwind.a
%{rustlibdir}/%{rust_musl_triple}/lib/self-contained/libc.a
%files debugger-common %files debugger-common
%dir %{rustlibdir} %dir %{rustlibdir}
@ -466,6 +467,9 @@ export %{rust_env}
%{_mandir}/man1/cargo*.1* %{_mandir}/man1/cargo*.1*
%changelog %changelog
* Sun Feb 27 2022 Liu Zixian <liuzixian4@huawei.com> - 1.58.1-1
- Update to 1.58.1
* Wed Feb 09 2022 Li Zheng <lizheng135@huawei.com> - 1.57.0-2 * Wed Feb 09 2022 Li Zheng <lizheng135@huawei.com> - 1.57.0-2
- Fix build error - Fix build error

32
rustc-1.56.0-disable-http2.patch → rustc-1.58.1-disable-http2.patch
View File

@ -1,7 +1,7 @@
From a27b88852f2e2f48d4a0434d2ef546d1ff29329c Mon Sep 17 00:00:00 2001 From 39b90a6ca3134982d3eadf96ea2067cc7cfc6d8d Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com> From: Liu Zixian <liuzixian4@huawei.com>
Date: Fri, 17 Dec 2021 23:27:57 +0800 Date: Sat, 22 Jan 2022 00:37:26 +0800
Subject: disable http2 Subject: [PATCH] disable http2
--- ---
Cargo.lock | 11 ----------- Cargo.lock | 11 -----------
@ -10,10 +10,10 @@ Subject: disable http2
3 files changed, 4 insertions(+), 21 deletions(-) 3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock
index 26f68e235..926c2db74 100644 index 2dbf34d87..908eb2c0b 100644
--- a/Cargo.lock --- a/Cargo.lock
+++ b/Cargo.lock +++ b/Cargo.lock
@@ -877,7 +877,6 @@ checksum = "e0f44960aea24a786a46907b8824ebc0e66ca06bf4e4978408c7499620343483" @@ -909,7 +909,6 @@ checksum = "d130987e6a6a34fe0889e1083022fa48cd90e6709a84be3fb8dd95801de5af20"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -21,7 +21,7 @@ index 26f68e235..926c2db74 100644
"libz-sys", "libz-sys",
"openssl-sys", "openssl-sys",
"pkg-config", "pkg-config",
@@ -1906,16 +1905,6 @@ version = "0.1.4" @@ -1926,16 +1925,6 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
@ -39,23 +39,23 @@ index 26f68e235..926c2db74 100644
name = "libz-sys" name = "libz-sys"
version = "1.1.3" version = "1.1.3"
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
index ba5b956dd..eca593482 100644 index e23f4ec06..4e615767e 100644
--- a/src/tools/cargo/Cargo.toml --- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml
@@ -25,7 +25,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } @@ -22,7 +22,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
cargo-util = { path = "crates/cargo-util", version = "0.1.1" } cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
crates-io = { path = "crates/crates-io", version = "0.33.0" } crates-io = { path = "crates/crates-io", version = "0.33.0" }
crossbeam-utils = "0.8" crossbeam-utils = "0.8"
-curl = { version = "0.4.39", features = ["http2"] } -curl = { version = "0.4.41", features = ["http2"] }
+curl = { version = "0.4.39", features = [] } +curl = { version = "0.4.41", features = [] }
curl-sys = "0.4.48" curl-sys = "0.4.50"
env_logger = "0.9.0" env_logger = "0.9.0"
pretty_env_logger = { version = "0.4", optional = true } pretty_env_logger = { version = "0.4", optional = true }
diff --git a/src/tools/cargo/src/cargo/core/package.rs b/src/tools/cargo/src/cargo/core/package.rs diff --git a/src/tools/cargo/src/cargo/core/package.rs b/src/tools/cargo/src/cargo/core/package.rs
index 6605a348e..92a01a89c 100644 index dd73ea25c..e1ed94321 100644
--- a/src/tools/cargo/src/cargo/core/package.rs --- a/src/tools/cargo/src/cargo/core/package.rs
+++ b/src/tools/cargo/src/cargo/core/package.rs +++ b/src/tools/cargo/src/cargo/core/package.rs
@@ -417,14 +417,8 @@ impl<'cfg> PackageSet<'cfg> { @@ -419,14 +419,8 @@ impl<'cfg> PackageSet<'cfg> {
// Also note that pipelining is disabled as curl authors have indicated // Also note that pipelining is disabled as curl authors have indicated
// that it's buggy, and we've empirically seen that it's buggy with HTTP // that it's buggy, and we've empirically seen that it's buggy with HTTP
// proxies. // proxies.
@ -72,7 +72,7 @@ index 6605a348e..92a01a89c 100644
Ok(PackageSet { Ok(PackageSet {
packages: package_ids packages: package_ids
@@ -653,7 +647,7 @@ impl<'cfg> PackageSet<'cfg> { @@ -655,7 +649,7 @@ impl<'cfg> PackageSet<'cfg> {
macro_rules! try_old_curl { macro_rules! try_old_curl {
($e:expr, $msg:expr) => { ($e:expr, $msg:expr) => {
let result = $e; let result = $e;
@ -82,5 +82,5 @@ index 6605a348e..92a01a89c 100644
warn!("ignoring libcurl {} error: {}", $msg, e); warn!("ignoring libcurl {} error: {}", $msg, e);
} }
-- --
2.33.1 2.34.1

20
rustc-1.56.0-disable-libssh2.patch → rustc-1.58.1-disable-libssh2.patch
View File

@ -1,7 +1,7 @@
From 2e519b6b69557ce39444b39e34db6e660c710aa2 Mon Sep 17 00:00:00 2001 From ea7aff0acb25c06a76dfc99f46543937750e910e Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com> From: Liu Zixian <liuzixian4@huawei.com>
Date: Fri, 17 Dec 2021 23:26:22 +0800 Date: Sat, 22 Jan 2022 00:36:17 +0800
Subject: disable libssh2 Subject: [PATCH] disable libssh2
--- ---
Cargo.lock | 15 --------------- Cargo.lock | 15 ---------------
@ -9,10 +9,10 @@ Subject: disable libssh2
2 files changed, 1 insertion(+), 16 deletions(-) 2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock
index 4f1a5ca35..26f68e235 100644 index 48d9fdb3d..2dbf34d87 100644
--- a/Cargo.lock --- a/Cargo.lock
+++ b/Cargo.lock +++ b/Cargo.lock
@@ -1895,7 +1895,6 @@ checksum = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885" @@ -1915,7 +1915,6 @@ checksum = "ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -20,7 +20,7 @@ index 4f1a5ca35..26f68e235 100644
"libz-sys", "libz-sys",
"openssl-sys", "openssl-sys",
"pkg-config", "pkg-config",
@@ -1917,20 +1916,6 @@ dependencies = [ @@ -1937,20 +1936,6 @@ dependencies = [
"libc", "libc",
] ]
@ -42,10 +42,10 @@ index 4f1a5ca35..26f68e235 100644
name = "libz-sys" name = "libz-sys"
version = "1.1.3" version = "1.1.3"
diff --git a/vendor/git2/Cargo.toml b/vendor/git2/Cargo.toml diff --git a/vendor/git2/Cargo.toml b/vendor/git2/Cargo.toml
index 4481d79c6..4e869c55f 100644 index 299b77a8d..a05099544 100644
--- a/vendor/git2/Cargo.toml --- a/vendor/git2/Cargo.toml
+++ b/vendor/git2/Cargo.toml +++ b/vendor/git2/Cargo.toml
@@ -52,7 +52,7 @@ version = "3.3.0" @@ -51,7 +51,7 @@ version = "3.3.0"
version = "0.1.39" version = "0.1.39"
[features] [features]
@ -55,5 +55,5 @@ index 4481d79c6..4e869c55f 100644
ssh = ["libgit2-sys/ssh"] ssh = ["libgit2-sys/ssh"]
ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"] ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
-- --
2.33.1 2.34.1