rust: update to 1.20.0.

This commit is contained in:
Leah Neukirchen 2017-09-07 00:19:45 +02:00
parent 24aba0c9ae
commit efbfcb1d26
3 changed files with 15 additions and 34 deletions

View file

@ -1,15 +0,0 @@
--- rustc-1.16.0-src/src/bootstrap/sanity.rs.orig
+++ rustc-1.16.0-src/src/bootstrap/sanity.rs
@@ -144,12 +144,6 @@
}
}
- // Externally configured LLVM requires FileCheck to exist
- let filecheck = build.llvm_filecheck(&build.config.build);
- if !filecheck.starts_with(&build.out) && !filecheck.exists() && build.config.codegen_tests {
- panic!("FileCheck executable {:?} does not exist", filecheck);
- }
-
for target in build.config.target.iter() {
// Can't compile for iOS unless we're on OSX
if target.contains("apple-ios") &&

View file

@ -1,13 +1,9 @@
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -21,7 +21,6 @@
use std::collections::HashSet;
use std::env;
@@ -21,3 +21,2 @@
use std::ffi::{OsStr, OsString};
-use std::fs;
use std::process::Command;
use build_helper::output;
@@ -132,27 +132,6 @@
panic!("the iOS target is only supported on OSX");
}

View file

@ -1,6 +1,6 @@
# Template file for 'rust'
pkgname=rust
version=1.19.0
version=1.20.0
revision=1
# NB. if you push any(!) new version, don't forget to put a build
# output of musl to https://repo.voidlinux.eu/distfiles/
@ -17,40 +17,40 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
homepage="http://www.rust-lang.org/"
license="MIT, Apache-2.0"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
checksum=15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51
checksum=2aa4875ff4472c6e35262bbb9052cb2623da3dae6084a858cc59d36f33f18214
case "$XBPS_MACHINE" in
x86_64-musl)
hostmakedepends+=" libcurl libgit2"
distfiles+="
https://repo.voidlinux.eu/distfiles/rustc-1.18.0-x86_64-unknown-linux-musl.tar.gz
https://repo.voidlinux.eu/distfiles/rust-std-1.18.0-x86_64-unknown-linux-musl.tar.gz
https://repo.voidlinux.eu/distfiles/rustc-1.19.0-x86_64-unknown-linux-musl.tar.gz
https://repo.voidlinux.eu/distfiles/rust-std-1.19.0-x86_64-unknown-linux-musl.tar.gz
https://repo.voidlinux.eu/distfiles/cargo-0.18.0-x86_64-unknown-linux-musl.tar.gz"
checksum+="
9ab8a7f347f13528399aecbeb13e93cf3ebda98f6cb610258409c5b1a1b79fbe
ac7f57e426c6e9f1c8793b137e7112441e0c33ad9b0a1ed458c6dbcdbf121fe4
28aa0f1335fad547072602520a773d29000785aceaed9ec71b1b207256b31d1f
4e9e92c56708cccc5f567058b21bc62cb0a40bf2ed38466f0dc28eac64aae7d2
28f2ee839f14f8b3edf3f4e4cc8600ac99ea50905ee8fb91116bba676728c2e9"
;;
x86_64)
# extract from src/stage0.txt
distfiles+="
https://static.rust-lang.org/dist/2017-06-08/rustc-1.18.0-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-06-08/rust-std-1.18.0-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-07-20/rustc-1.19.0-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-07-20/rust-std-1.19.0-x86_64-unknown-linux-gnu.tar.gz
https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
checksum+="
f2a34e20166ccf6eda4de46a9efb02821df5c3f34667e2988284a8eaee408113
4a66150781e224412ebd9dd6d643ad65ecc5668a7754e4a12e115be6ce7bf527
4c8df3088d17c8e06bf58d453d39bd521487defcefc8193203b80f0fb797d6fe
5905803e8a127f656bf253978692f0d6cf6c9206c527e4d6d7e981980618d1b6
d9e69d2b87dc0cf7fafe0e0eb64f82fe3414ef14fcb27f5eeff34df860e459d9"
;;
i686)
# extract from src/stage0.txt
distfiles+="
https://static.rust-lang.org/dist/2017-06-08/rustc-1.18.0-i686-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-06-08/rust-std-1.18.0-i686-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-07-20/rustc-1.19.0-i686-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-07-20/rust-std-1.19.0-i686-unknown-linux-gnu.tar.gz
https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-linux-gnu.tar.gz"
checksum+="
0cb9bb95373cee8ba26e8f517c46f8c58a29e22f2c7c08a4d152306c6ffc7115
3b93c7b856b98f61ec0f640bc96373f4762484ab3340866902c8c96933bcf10b
33377c93d8afc08f3f211adcfb88b0e9bb0fba5af2ee52016293921c14aa355c
7cdc76ef163050e9bc352d0ffc48d7d40ae66be0eb1fa1295e0635665c6e32ef
863a4f92bbeec76257403fd571a90b90bd759ec8bcaddb7517fb89d40959e9e5"
;;
esac