up to 1.25.0 (adds support for llvm 6)

diff --git a/rust-1.21.0-44203-exclude-compiler-rt-test.patch b/rust-1.21.0-44203-exclude-compiler-rt-test.patch
deleted file mode 100644 (file)
index feba8ab..0000000
--- a/rust-1.21.0-44203-exclude-compiler-rt-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 35f8a2065b7d17d39481a75cefa739df7a061084 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Wed, 30 Aug 2017 18:20:59 -0700
-Subject: [PATCH] rustbuild: update the rust-src filter for compiler-rt
-
-We wanted `src/compiler-rt/test` filtered from the `rust-src` package,
-but that path is now `src/libcompiler_builtins/compiler-rt/test`.  This
-saves over half of the installed rust-src size. (50MB -> 22MB)
----
- src/bootstrap/dist.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 746f85a9d59d..05d59e7d5956 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -754,7 +754,7 @@ impl Step for Src {
-             "src/libprofiler_builtins",
-         ];
-         let std_src_dirs_exclude = [
--            "src/compiler-rt/test",
-+            "src/libcompiler_builtins/compiler-rt/test",
-             "src/jemalloc/test/unit",
-         ];
- 
--- 
-2.13.5
-

diff --git a/rust.spec b/rust.spec
index 4264b076aa438e8df0bae36247886477b069d331..357c09bc50c619541ae12a71ff5bb375d8693910 100644 (file)
--- a/rust.spec
+++ b/rust.spec
@@ -18,25 +18,24 @@
 # 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.20.0
-%define                bootstrap_cargo 0.21.0
-%define                bootstrap_date  2017-08-31
+%define                bootstrap_rust  1.24.0
+%define                bootstrap_cargo 0.25.0
+%define                bootstrap_date  2018-02-15
 
 Summary:       The Rust Programming Language
 Summary(pl.UTF-8):     Język programowania Rust
 Name:          rust
-Version:       1.21.0
+Version:       1.25.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.gz
-# Source0-md5: bc494706b764276613064aad52922f53
+# Source0-md5: d8d4d30c8d0b905f978bee3fdd618db5
 Source1:       https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.gz
-# Source1-md5: 5b63778b4877bcfd431b56c485f4876b
+# Source1-md5: 61be17f80e1811211450e5b733624232
 Source2:       https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.gz
-# Source2-md5: 5e8c3a6a7b94e6a32f85230111a684a3
-Patch0:                rust-1.21.0-44203-exclude-compiler-rt-test.patch
+# Source2-md5: 5568788cd5d96173a89bd0e82a2aa356
 URL:           https://www.rust-lang.org/
 # for src/compiler-rt
 BuildRequires: cmake >= 3.4.3
@@ -158,7 +157,6 @@ programowania Rust i jego biblioteki standardowej.
 
 %prep
 %setup -q -n %{rustc_package}
-%patch0 -p1
 
 %if %{with bootstrap}
 %ifarch %{x8664}
@@ -292,6 +290,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rustdoc.1*
 %dir %{rustlibdir}
 %dir %{rustlibdir}/%{rust_triple}
+%dir %{rustlibdir}/%{rust_triple}/codegen-backends
+%attr(755,root,root) %{rustlibdir}/%{rust_triple}/codegen-backends/*.so
 %dir %{rustlibdir}/%{rust_triple}/lib
 %attr(755,root,root) %{rustlibdir}/%{rust_triple}/lib/*.so
 %{rustlibdir}/%{rust_triple}/lib/*.rlib