jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rust: update to 1.13.0.

Browse source
This commit is contained in:
Christian Neukirchen 2016-11-12 18:41:23 +01:00
parent 89ce2586e9
commit 08abb0ba43
3 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/rust/patches/dont-require-filecheck.patch
View file

@ -1,16 +1,12 @@
From: Jakub Jirutka <jakub@jirutka.cz> --- rustc-1.13.0/src/bootstrap/sanity.rs
Date: Thu, 04 Aug 2016 17:53:00 +0200 +++ rustc-1.13.0/src/bootstrap/sanity.rs
Subject: [PATCH] Do not require FileCheck @@ -93,12 +93,6 @@
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -76,12 +76,6 @@
need_cmd(build.cxx(host).as_ref()); need_cmd(build.cxx(host).as_ref());
} }
- // Externally configured LLVM requires FileCheck to exist - // Externally configured LLVM requires FileCheck to exist
- let filecheck = build.llvm_filecheck(&build.config.build); - let filecheck = build.llvm_filecheck(&build.config.build);
- if !filecheck.starts_with(&build.out) && !filecheck.exists() { - if !filecheck.starts_with(&build.out) && !filecheck.exists() && build.config.codegen_tests {
- panic!("filecheck executable {:?} does not exist", filecheck); - panic!("filecheck executable {:?} does not exist", filecheck);
- } - }
- -

13
srcpkgs/rust/patches/link-musl-dynamically.patch
View file

@ -9,14 +9,14 @@ https://gist.github.com/japaric/52b8816a4c86f5a4699bcc50ebc3e020.
--- a/src/bootstrap/sanity.rs --- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs
@@ -97,26 +91,6 @@ @@ -115,27 +115,6 @@
panic!("the iOS target is only supported on OSX"); panic!("the iOS target is only supported on OSX");
} }
- // Make sure musl-root is valid if specified - // Make sure musl-root is valid if specified
- if target.contains("musl") && !target.contains("mips") { - if target.contains("musl") && !target.contains("mips") {
- match build.config.musl_root { - match build.musl_root(target) {
- Some(ref root) => { - Some(root) => {
- if fs::metadata(root.join("lib/libc.a")).is_err() { - if fs::metadata(root.join("lib/libc.a")).is_err() {
- panic!("couldn't find libc.a in musl dir: {}", - panic!("couldn't find libc.a in musl dir: {}",
- root.join("lib").display()); - root.join("lib").display());
@ -27,8 +27,9 @@ https://gist.github.com/japaric/52b8816a4c86f5a4699bcc50ebc3e020.
- } - }
- } - }
- None => { - None => {
- panic!("when targeting MUSL the build.musl-root option \ - panic!("when targeting MUSL either the build.musl-root \
- must be specified in config.toml") - option or the target.$TARGET.musl-root one must \
- be specified in config.toml")
- } - }
- } - }
- } - }

25
srcpkgs/rust/template
View file

@ -1,7 +1,9 @@
# Template file for 'rust' # Template file for 'rust'
pkgname=rust pkgname=rust
version=1.12.1 version=1.13.0
revision=1 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/
wrksrc="rustc-${version}" wrksrc="rustc-${version}"
lib32disabled=yes lib32disabled=yes
patch_args="-Np1" patch_args="-Np1"
@ -15,27 +17,28 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.rust-lang.org/" homepage="http://www.rust-lang.org/"
license="MIT, Apache-2.0" license="MIT, Apache-2.0"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
checksum=97913ae4cb255618aaacd1a534b11f343634b040b32656250d09d8d9ec02d3dc checksum=ecb84775ca977a5efec14d0cad19621a155bfcbbf46e8050d18721bb1e3e5084
case "$XBPS_MACHINE" in case "$XBPS_MACHINE" in
x86_64-musl) x86_64-musl)
distfiles+=" distfiles+="
https://repo.voidlinux.eu/distfiles/rustc-1.11.0-x86_64-unknown-linux-musl.tar.gz https://repo.voidlinux.eu/distfiles/rustc-1.12.1-x86_64-unknown-linux-musl.tar.gz
https://repo.voidlinux.eu/distfiles/rust-std-1.11.0-x86_64-unknown-linux-musl.tar.gz https://repo.voidlinux.eu/distfiles/rust-std-1.12.1-x86_64-unknown-linux-musl.tar.gz
https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz" https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz"
checksum+=" checksum+="
6f1cfcab1760573f949265726951e9032f9f3ce8a202d727c1f84026341b8c33 96733254cebd2dfacbfc774d7d788cb3df4d30cdfacd3f9c7883b0ffd104821d
fbb6398b8537f9435d9c362f5e79be000df9df090d5d2bc6113c69bc050aa1fa dcc68b2d920947f8795c46239f141dfc876803e7b90f34852dea15d51db13322
587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9" 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9"
;; ;;
x86_64) x86_64)
# extract from src/stage0.txt
distfiles+=" distfiles+="
https://static.rust-lang.org/dist/2016-08-16/rustc-1.11.0-x86_64-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/2016-10-20/rustc-1.12.1-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2016-08-16/rust-std-1.11.0-x86_64-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/2016-10-20/rust-std-1.12.1-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/cargo-dist/2016-07-05/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" https://static.rust-lang.org/cargo-dist/2016-08-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
checksum+=" checksum+="
e9d27a72900da33c1bbd0e59dd42fd6414c6bcdfa33593fb7c7360068406394a a753e3b6cfa8417978e4bfc0d3282f22be4abc5e106af39f4cb54dc775f64546
893a53b5f78ec9eb7ac4ad3b3bd375d2ddad8ca1687ed5867621ec157eddbea5 2d428042fd0b6cc1b08584341b2ad81dabe7abdfadcb0eb5082cfbc93e1ab90b
cf47787fd50bf6c7f68db290eab054e493e4619d42a8faf66565431449055f1c" cf47787fd50bf6c7f68db290eab054e493e4619d42a8faf66565431449055f1c"
;; ;;
esac esac