From 08abb0ba434d94ffd952c43eed168ada728f6cdd Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 12 Nov 2016 18:41:23 +0100 Subject: [PATCH] rust: update to 1.13.0. --- .../rust/patches/dont-require-filecheck.patch | 12 +++------ .../rust/patches/link-musl-dynamically.patch | 13 +++++----- srcpkgs/rust/template | 25 +++++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/srcpkgs/rust/patches/dont-require-filecheck.patch b/srcpkgs/rust/patches/dont-require-filecheck.patch index c1f5a11072..86ecee4a9c 100644 --- a/srcpkgs/rust/patches/dont-require-filecheck.patch +++ b/srcpkgs/rust/patches/dont-require-filecheck.patch @@ -1,16 +1,12 @@ -From: Jakub Jirutka -Date: Thu, 04 Aug 2016 17:53:00 +0200 -Subject: [PATCH] Do not require FileCheck - ---- a/src/bootstrap/sanity.rs -+++ b/src/bootstrap/sanity.rs -@@ -76,12 +76,6 @@ +--- rustc-1.13.0/src/bootstrap/sanity.rs ++++ rustc-1.13.0/src/bootstrap/sanity.rs +@@ -93,12 +93,6 @@ need_cmd(build.cxx(host).as_ref()); } - // Externally configured LLVM requires FileCheck to exist - 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); - } - diff --git a/srcpkgs/rust/patches/link-musl-dynamically.patch b/srcpkgs/rust/patches/link-musl-dynamically.patch index 3f75f4a257..d688b9810d 100644 --- a/srcpkgs/rust/patches/link-musl-dynamically.patch +++ b/srcpkgs/rust/patches/link-musl-dynamically.patch @@ -9,14 +9,14 @@ https://gist.github.com/japaric/52b8816a4c86f5a4699bcc50ebc3e020. --- a/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"); } - + - // Make sure musl-root is valid if specified - if target.contains("musl") && !target.contains("mips") { -- match build.config.musl_root { -- Some(ref root) => { +- match build.musl_root(target) { +- Some(root) => { - if fs::metadata(root.join("lib/libc.a")).is_err() { - panic!("couldn't find libc.a in musl dir: {}", - root.join("lib").display()); @@ -27,8 +27,9 @@ https://gist.github.com/japaric/52b8816a4c86f5a4699bcc50ebc3e020. - } - } - None => { -- panic!("when targeting MUSL the build.musl-root option \ -- must be specified in config.toml") +- panic!("when targeting MUSL either the build.musl-root \ +- option or the target.$TARGET.musl-root one must \ +- be specified in config.toml") - } - } - } diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index c09f14c4b5..c7248471f1 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,7 +1,9 @@ # Template file for 'rust' pkgname=rust -version=1.12.1 +version=1.13.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/ wrksrc="rustc-${version}" lib32disabled=yes patch_args="-Np1" @@ -15,27 +17,28 @@ maintainer="Juan RP " homepage="http://www.rust-lang.org/" license="MIT, Apache-2.0" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=97913ae4cb255618aaacd1a534b11f343634b040b32656250d09d8d9ec02d3dc +checksum=ecb84775ca977a5efec14d0cad19621a155bfcbbf46e8050d18721bb1e3e5084 case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://repo.voidlinux.eu/distfiles/rustc-1.11.0-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/rustc-1.12.1-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" checksum+=" - 6f1cfcab1760573f949265726951e9032f9f3ce8a202d727c1f84026341b8c33 - fbb6398b8537f9435d9c362f5e79be000df9df090d5d2bc6113c69bc050aa1fa + 96733254cebd2dfacbfc774d7d788cb3df4d30cdfacd3f9c7883b0ffd104821d + dcc68b2d920947f8795c46239f141dfc876803e7b90f34852dea15d51db13322 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9" ;; x86_64) + # extract from src/stage0.txt 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-08-16/rust-std-1.11.0-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/dist/2016-10-20/rustc-1.12.1-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-08-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - e9d27a72900da33c1bbd0e59dd42fd6414c6bcdfa33593fb7c7360068406394a - 893a53b5f78ec9eb7ac4ad3b3bd375d2ddad8ca1687ed5867621ec157eddbea5 + a753e3b6cfa8417978e4bfc0d3282f22be4abc5e106af39f4cb54dc775f64546 + 2d428042fd0b6cc1b08584341b2ad81dabe7abdfadcb0eb5082cfbc93e1ab90b cf47787fd50bf6c7f68db290eab054e493e4619d42a8faf66565431449055f1c" ;; esac