Skip to content

Commit a3e679e

Browse files
committed
up to 1.68.0
- fix install by reverting 23a34c1 (see rust-lang/rust#108948)
1 parent 449de7a commit a3e679e

File tree

2 files changed

+50
-9
lines changed

2 files changed

+50
-9
lines changed

llvm-tools-install.patch

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 23a34c18f7b2ce8b20fed717ef48e2be1776246b Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <[email protected]>
3+
Date: Sun, 11 Dec 2022 12:19:17 +0100
4+
Subject: [PATCH] bootstrap: Allow installing llvm-tools
5+
6+
---
7+
src/bootstrap/builder.rs | 1 +
8+
src/bootstrap/install.rs | 6 ++++++
9+
2 files changed, 7 insertions(+)
10+
11+
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
12+
index 8ee6d49da8f0e..3f551dc119b5d 100644
13+
--- a/src/bootstrap/builder.rs
14+
+++ b/src/bootstrap/builder.rs
15+
@@ -744,6 +744,7 @@ impl<'a> Builder<'a> {
16+
install::RustDemangler,
17+
install::Clippy,
18+
install::Miri,
19+
+ install::LlvmTools,
20+
install::Analysis,
21+
install::Src,
22+
install::Rustc
23+
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
24+
index 7672b7c913594..c53d0d7e4cb7c 100644
25+
--- a/src/bootstrap/install.rs
26+
+++ b/src/bootstrap/install.rs
27+
@@ -205,6 +205,12 @@ install!((self, builder, _config),
28+
);
29+
}
30+
};
31+
+ LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
32+
+ let tarball = builder
33+
+ .ensure(dist::LlvmTools { target: self.target })
34+
+ .expect("missing llvm-tools");
35+
+ install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
36+
+ };
37+
Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, {
38+
if let Some(tarball) = builder.ensure(dist::Rustfmt {
39+
compiler: self.compiler,

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.66.1
24+
%define bootstrap_rust 1.67.1
2525
%define bootstrap_cargo %{bootstrap_rust}
26-
%define bootstrap_date 2023-01-10
26+
%define bootstrap_date 2023-02-09
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.67.1
39+
Version: 1.68.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: e5e47e53c52574ce89ea200e52819f81
45+
# Source0-md5: e0c4908ceb01945930da218d172a21ba
4646
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
47-
# Source1-md5: 7bdb0591ffdc443f986a3563b5fa5f71
47+
# Source1-md5: 800e693e0ac317755f8f0e19269540db
4848
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
49-
# Source2-md5: f6771f700a1c0cafede4f205c1d7c3d9
49+
# Source2-md5: 65d86e2c17b1a09df55860a1d8dec9d4
5050
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
51-
# Source3-md5: 41a059934972af4b327958ce6ee54ac7
51+
# Source3-md5: 127fdf3e824e23808a1fa6a8e92bcf56
5252
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
53-
# Source4-md5: 3ad4208d29ca809073b43f96767e8b32
53+
# Source4-md5: 70acb1412ca21e288105d86a7d5b975b
5454
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
55-
# Source5-md5: f091919a1e13f71db429b3af957bf361
55+
# Source5-md5: 1d917abdc484fd34c1471a931349a2c5
56+
Patch0: llvm-tools-install.patch
5657
URL: https://www.rust-lang.org/
5758
# for src/compiler-rt
5859
BuildRequires: cmake >= 3.4.3
@@ -341,6 +342,7 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
341342

342343
%prep
343344
%setup -q -n %{rustc_package}
345+
%patch0 -p1 -R
344346

345347
%if %{with bootstrap}
346348
%ifarch %{x8664} x32

0 commit comments

Comments
 (0)