rpms
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

beta test

This commit is contained in:
Josh Stone 2017-09-15 13:06:46 -07:00
parent 688aed533e
commit 84c02283ad
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rust-1.21.0-44353-install-rustc.patch
View File

@ -1,28 +0,0 @@
From 110efe25fae60570c00e00d4c6d609f3f9666fb3 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 5 Sep 2017 14:19:22 -0700
Subject: [PATCH] Include rustc in the default `./x.py install`
The default install used to include rustc, rust-std, and rust-docs, but
the refactoring in commit 6b3413d825fa6 make rustc only default in
extended builds. This commit makes rustc installed by default again.
---
src/bootstrap/install.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index 89690e444d1f..608924c9c28d 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -200,7 +200,7 @@ install!((self, builder, _config),
builder.ensure(dist::Src);
install_src(builder, self.stage);
}, ONLY_BUILD;
- Rustc, "src/librustc", _config.extended, only_hosts: true, {
+ Rustc, "src/librustc", true, only_hosts: true, {
builder.ensure(dist::Rustc {
compiler: builder.compiler(self.stage, self.target),
});
--
2.13.5

14
rust.spec
View File

@ -48,7 +48,7 @@
Name: rust
Version: 1.21.0
Release: 0.beta.2%{?dist}
Release: 0.beta.3%{?dist}
Summary: The Rust Programming Language
License: (ASL 2.0 or MIT) and (BSD and ISC and MIT)
# ^ written as: (rust itself) and (bundled libraries)
@ -63,9 +63,8 @@ ExclusiveArch: %{rust_arches}
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
Patch1: rust-1.21.0-44203-exclude-compiler-rt-test.patch
Patch2: rust-1.21.0-44353-install-rustc.patch
Patch3: rust-1.21.0-44066-ppc64-struct-abi.patch
Patch4: rust-1.21.0-44440-s390x-global-align.patch
Patch2: rust-1.21.0-44066-ppc64-struct-abi.patch
Patch3: rust-1.21.0-44440-s390x-global-align.patch
# Get the Rust triple for any arch.
%{lua: function rust_triple(arch)
@ -312,9 +311,8 @@ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
%endif
%patch1 -p1 -b .compiler-rt
%patch2 -p1 -b .install-rustc
%patch3 -p1 -b .ppc64-struct-abi
%patch4 -p1 -b .s390x-global-align
%patch2 -p1 -b .ppc64-struct-abi
%patch3 -p1 -b .s390x-global-align
# The configure macro will modify some autoconf-related files, which upsets
# cargo when it tries to verify checksums in those files. If we just truncate
@ -473,7 +471,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
%changelog
* Tue Sep 12 2017 Josh Stone <jistone@redhat.com> - 1.21.0-0.beta.2
* Fri Sep 15 2017 Josh Stone <jistone@redhat.com> - 1.21.0-0.beta.3
- beta test
* Mon Sep 11 2017 Josh Stone <jistone@redhat.com> - 1.20.0-2