[packages/rust] up to 1.54.0
atler
atler at pld-linux.org
Mon Aug 9 13:03:46 CEST 2021
commit 5a053d91fface21725c15a1e0b510bad2c6d4f84
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Aug 9 13:03:14 2021 +0200
up to 1.54.0
disable_miri.patch | 164 -----------------------------------------------------
rust.spec | 24 ++++----
2 files changed, 11 insertions(+), 177 deletions(-)
---
diff --git a/rust.spec b/rust.spec
index 87ad97e..a2ff943 100644
--- a/rust.spec
+++ b/rust.spec
@@ -21,9 +21,9 @@
# To bootstrap from scratch, set the channel and date from src/stage0.txt
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
# or nightly wants some beta-YYYY-MM-DD
-%define bootstrap_rust 1.52.0
-%define bootstrap_cargo 1.52.0
-%define bootstrap_date 2021-05-06
+%define bootstrap_rust 1.53.0
+%define bootstrap_cargo 1.53.0
+%define bootstrap_date 2021-06-17
%ifarch x32
%define with_cross 1
@@ -36,24 +36,23 @@
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.53.0
-Release: 2
+Version: 1.54.0
+Release: 1
# Licenses: (rust itself) and (bundled libraries)
License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
Group: Development/Languages
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
-# Source0-md5: 2c552dc35afd41ac7294637a7e85f1a3
+# Source0-md5: f1fc7b0f0c7aff2b8d61e58b510a6f66
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 5451acacf06d3eed947fdfa7eb96d0e8
+# Source1-md5: 3f2ea3d908dac317d6006a117463f18e
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 136df423e63932ed02d18e9ba7923537
+# Source2-md5: 2ea9461d6c06c38ad85cc6037d70b9d7
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 2868d64a0ec681f3fe2bb59e20569d26
+# Source3-md5: 0772ec454b29685a4d79ead06c5cdd23
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: e36ad0e20aef949b4335cf2599a136bb
+# Source4-md5: 7ecbfb7344a3dbafcaddffb898afbfa9
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
-# Source5-md5: 77d28773b9fa07979a075e5232b23ac7
-Patch0: disable_miri.patch
+# Source5-md5: 3650d93b062c6605e3aa96ce4d63335c
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
@@ -326,7 +325,6 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
%prep
%setup -q -n %{rustc_package}
-%patch0 -p1
%if %{with bootstrap}
%ifarch %{x8664} x32
diff --git a/disable_miri.patch b/disable_miri.patch
deleted file mode 100644
index 73eec74..0000000
--- a/disable_miri.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 601d24810e89efd42f7cd69d4a7ccecd4e35364d Mon Sep 17 00:00:00 2001
-From: Eric Huss <eric at huss.org>
-Date: Tue, 22 Jun 2021 22:10:25 -0700
-Subject: [PATCH 1/2] Don't dist miri on stable or beta.
-
----
- src/bootstrap/dist.rs | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 71ed0af4a7c04..e0c33f7357741 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -1171,6 +1171,9 @@ impl Step for Miri {
- }
-
- fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
-+ if !builder.build.unstable_features() {
-+ return None;
-+ }
- let compiler = self.compiler;
- let target = self.target;
- assert!(builder.config.extended);
-
-From 6aa79a34d87252deaae11e75663e5740a22f14ea Mon Sep 17 00:00:00 2001
-From: Eric Huss <eric at huss.org>
-Date: Wed, 23 Jun 2021 07:03:42 -0700
-Subject: [PATCH 2/2] Comment and include rust-analyzer.
-
----
- src/bootstrap/dist.rs | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index e0c33f7357741..19895baf08f16 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -1072,6 +1072,12 @@ impl Step for RustAnalyzer {
- }
-
- fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
-+ // This prevents rust-analyzer from being built for "dist" or "install"
-+ // on the stable/beta channels. It is a nightly-only tool and should
-+ // not be included.
-+ if !builder.build.unstable_features() {
-+ return None;
-+ }
- let compiler = self.compiler;
- let target = self.target;
- assert!(builder.config.extended);
-@@ -1171,6 +1177,9 @@ impl Step for Miri {
- }
-
- fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
-+ // This prevents miri from being built for "dist" or "install"
-+ // on the stable/beta channels. It is a nightly-only tool and should
-+ // not be included.
- if !builder.build.unstable_features() {
- return None;
- }
-From f698cacc33f0c9148bb3bb7501087b0d37e837ec Mon Sep 17 00:00:00 2001
-From: Eric Huss <eric at huss.org>
-Date: Fri, 9 Jul 2021 10:01:23 -0700
-Subject: [PATCH 1/3] Fix rust-analyzer install when not available.
-
----
- src/bootstrap/install.rs | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
-index 13ee909afd5e4..6f3054538a898 100644
---- a/src/bootstrap/install.rs
-+++ b/src/bootstrap/install.rs
-@@ -165,10 +165,15 @@ install!((self, builder, _config),
- }
- };
- RustAnalyzer, "rust-analyzer", Self::should_build(_config), only_hosts: true, {
-- let tarball = builder
-- .ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target })
-- .expect("missing rust-analyzer");
-- install_sh(builder, "rust-analyzer", self.compiler.stage, Some(self.target), &tarball);
-+ if let Some(tarball) =
-+ builder.ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target })
-+ {
-+ install_sh(builder, "rust-analyzer", self.compiler.stage, Some(self.target), &tarball);
-+ } else {
-+ builder.info(
-+ &format!("skipping Install rust-analyzer stage{} ({})", self.compiler.stage, self.target),
-+ );
-+ }
- };
- Clippy, "clippy", Self::should_build(_config), only_hosts: true, {
- let tarball = builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target });
-
-From 60ff731110815349dbc052c36e9cc50b9f12f32a Mon Sep 17 00:00:00 2001
-From: Eric Huss <eric at huss.org>
-Date: Sun, 11 Jul 2021 09:01:31 -0700
-Subject: [PATCH 2/3] Add comments why install steps should never fail.
-
----
- src/bootstrap/install.rs | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
-index 6f3054538a898..2ac9d3dda206f 100644
---- a/src/bootstrap/install.rs
-+++ b/src/bootstrap/install.rs
-@@ -139,11 +139,15 @@ macro_rules! install {
-
- install!((self, builder, _config),
- Docs, "src/doc", _config.docs, only_hosts: false, {
-+ // `expect` should be safe, only None when config.docs is false,
-+ // which is guarded in `should_run`
- let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs");
- install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
- };
- Std, "library/std", true, only_hosts: false, {
- for target in &builder.targets {
-+ // `expect` should be safe, only None when host != build, but this
-+ // only runs when host == build
- let tarball = builder.ensure(dist::Std {
- compiler: self.compiler,
- target: *target
-@@ -217,6 +221,8 @@ install!((self, builder, _config),
- }
- };
- Analysis, "analysis", Self::should_build(_config), only_hosts: false, {
-+ // `expect` should be safe, only None with host != build, but this
-+ // only uses the `build` compiler
- let tarball = builder.ensure(dist::Analysis {
- // Find the actual compiler (handling the full bootstrap option) which
- // produced the save-analysis data because that data isn't copied
-
-From 166c147c2727cd6d6ad4d39c40c51273b8a63c96 Mon Sep 17 00:00:00 2001
-From: Eric Huss <eric at huss.org>
-Date: Mon, 12 Jul 2021 13:29:47 -0700
-Subject: [PATCH 3/3] Provide a better error when `x.py install src/doc`
- doesn't work.
-
----
- src/bootstrap/install.rs | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
-index 2ac9d3dda206f..8a1b6df0dafe3 100644
---- a/src/bootstrap/install.rs
-+++ b/src/bootstrap/install.rs
-@@ -139,10 +139,12 @@ macro_rules! install {
-
- install!((self, builder, _config),
- Docs, "src/doc", _config.docs, only_hosts: false, {
-- // `expect` should be safe, only None when config.docs is false,
-- // which is guarded in `should_run`
-- let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs");
-- install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
-+ if let Some(tarball) = builder.ensure(dist::Docs { host: self.target }) {
-+ install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
-+ } else {
-+ panic!("docs are not available to install, \
-+ check that `build.docs` is true in `config.toml`");
-+ }
- };
- Std, "library/std", true, only_hosts: false, {
- for target in &builder.targets {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rust.git/commitdiff/5a053d91fface21725c15a1e0b510bad2c6d4f84
More information about the pld-cvs-commit
mailing list