Skip to content

Commit 6e05d45

Browse files
committed
up to 1.66.0
- quick hack to workaround miri installation failure while it's not built (rust-lang/rust#105816)
1 parent 4079dca commit 6e05d45

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

no-install-miri.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- rustc-1.66.0-src/src/bootstrap/install.rs.orig 2022-12-12 17:02:12.000000000 +0100
2+
+++ rustc-1.66.0-src/src/bootstrap/install.rs 2022-12-18 00:01:24.076587533 +0100
3+
@@ -130,7 +130,7 @@
4+
impl $name {
5+
#[allow(dead_code)]
6+
fn should_build(config: &Config) -> bool {
7+
- config.extended && config.tools.as_ref()
8+
+ $path_or_alias != "miri" && config.extended && config.tools.as_ref()
9+
.map_or(true, |t| t.contains($path_or_alias))
10+
}
11+
}

rust.spec

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
# To bootstrap from scratch, set the channel and date from src/stage0.json
2222
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
2323
# or nightly wants some beta-YYYY-MM-DD
24-
%define bootstrap_rust 1.64.0
24+
%define bootstrap_rust 1.65.0
2525
%define bootstrap_cargo %{bootstrap_rust}
26-
%define bootstrap_date 2022-09-22
26+
%define bootstrap_date 2022-11-03
2727

2828
%ifarch x32
2929
%define with_cross 1
@@ -36,23 +36,24 @@
3636
Summary: The Rust Programming Language
3737
Summary(pl.UTF-8): Język programowania Rust
3838
Name: rust
39-
Version: 1.65.0
39+
Version: 1.66.0
4040
Release: 1
4141
# Licenses: (rust itself) and (bundled libraries)
4242
License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
4343
Group: Development/Languages
4444
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
45-
# Source0-md5: e8588b74b238f0f2f2701217cfd449e1
45+
# Source0-md5: b519b711f36f1d2b4e23cd5c28bb16d1
4646
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
47-
# Source1-md5: 2c4c8116a0121d260591c4f4e9a9e1a8
47+
# Source1-md5: 74858f078f2e16ccf2a0b5ce2cb08557
4848
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
49-
# Source2-md5: 810702367f20ea89a62096df07d8e88d
49+
# Source2-md5: d5819e8f1fed42b8c4e7e996da7fba4f
5050
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
51-
# Source3-md5: c335b36395834b5e532a8d3247cc3cd4
51+
# Source3-md5: 81f3f09ab36e7b800775024d277e27fd
5252
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
53-
# Source4-md5: 1e2a697052328304af093875255f2591
53+
# Source4-md5: 7bf66e055741fddaf3f82efe6eeb83b7
5454
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
55-
# Source5-md5: 25b5bb6f3b2db5b876bd379bf3d79867
55+
# Source5-md5: a4bbebeed5c0d2f79f362dd7d3619769
56+
Patch0: no-install-miri.patch
5657
URL: https://www.rust-lang.org/
5758
# for src/compiler-rt
5859
BuildRequires: cmake >= 3.4.3
@@ -337,6 +338,7 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
337338

338339
%prep
339340
%setup -q -n %{rustc_package}
341+
%patch0 -p1
340342

341343
%if %{with bootstrap}
342344
%ifarch %{x8664} x32

0 commit comments

Comments
 (0)