From dcc70e0cdd19f8da2660911a3031380805606be2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 16 Mar 2017 21:43:31 +0100 Subject: [PATCH] rust: update to 1.16.0. --- srcpkgs/rust/patches/cargo.patch | 20 ++++++++++++ .../rust/patches/dont-require-filecheck.patch | 14 ++++---- .../rust/patches/link-musl-dynamically.patch | 21 ++++++++---- srcpkgs/rust/template | 32 +++++++++---------- 4 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 srcpkgs/rust/patches/cargo.patch diff --git a/srcpkgs/rust/patches/cargo.patch b/srcpkgs/rust/patches/cargo.patch new file mode 100644 index 00000000000..5f1febd4c77 --- /dev/null +++ b/srcpkgs/rust/patches/cargo.patch @@ -0,0 +1,20 @@ +--- rustc-1.16.0-src/src/tools/rustbook/Cargo.toml.orig ++++ rustc-1.16.0-src/src/tools/rustbook/Cargo.toml +@@ -2,7 +2,6 @@ + authors = ["The Rust Project Developers"] + name = "rustbook" + version = "0.0.0" +-build = false + + [[bin]] + name = "rustbook" +--- rustc-1.16.0-src/src/librustc_plugin/Cargo.toml.orig ++++ rustc-1.16.0-src/src/librustc_plugin/Cargo.toml +@@ -2,7 +2,6 @@ + authors = ["The Rust Project Developers"] + name = "rustc_plugin" + version = "0.0.0" +-build = false + + [lib] + name = "rustc_plugin" diff --git a/srcpkgs/rust/patches/dont-require-filecheck.patch b/srcpkgs/rust/patches/dont-require-filecheck.patch index 86ecee4a9c2..b9ba5d38f71 100644 --- a/srcpkgs/rust/patches/dont-require-filecheck.patch +++ b/srcpkgs/rust/patches/dont-require-filecheck.patch @@ -1,15 +1,15 @@ ---- 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()); +--- 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); +- panic!("FileCheck executable {:?} does not exist", filecheck); - } - for target in build.config.target.iter() { - // Either can't build or don't want to run jemalloc on these targets - if target.contains("rumprun") || + // Can't compile for iOS unless we're on OSX + if target.contains("apple-ios") && diff --git a/srcpkgs/rust/patches/link-musl-dynamically.patch b/srcpkgs/rust/patches/link-musl-dynamically.patch index 457616c6d53..95917fe6516 100644 --- a/srcpkgs/rust/patches/link-musl-dynamically.patch +++ b/srcpkgs/rust/patches/link-musl-dynamically.patch @@ -1,16 +1,25 @@ ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -89,10 +89,6 @@ - t!(fs::create_dir_all(&libdir)); - } +--- rustc-1.16.0-src/src/bootstrap/compile.rs.orig ++++ rustc-1.16.0-src/src/bootstrap/compile.rs +@@ -93,19 +93,6 @@ + + t!(fs::create_dir_all(&libdir)); add_to_sysroot(&out_dir, &libdir); - - if target.contains("musl") && !target.contains("mips") { - copy_musl_third_party_objects(build, target, &libdir); +- } +-} +- +-/// Copies the crt(1,i,n).o startup objects +-/// +-/// Only required for musl targets that statically link to libc +-fn copy_musl_third_party_objects(build: &Build, target: &str, into: &Path) { +- for &obj in &["crt1.o", "crti.o", "crtn.o"] { +- copy(&build.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj)); - } } - /// Copies the crt(1,i,n).o startup objects + /// Build and prepare startup objects like rsbegin.o and rsend.o --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs @@ -132,27 +132,6 @@ diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index ca2fa66ad35..9b1ea1f732d 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,6 +1,6 @@ # Template file for 'rust' pkgname=rust -version=1.15.1 +version=1.16.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,39 +17,39 @@ maintainer="Leah Neukirchen " homepage="http://www.rust-lang.org/" license="MIT, Apache-2.0" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327 +checksum=f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4 case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://repo.voidlinux.eu/distfiles/rustc-1.14.0-x86_64-unknown-linux-musl.tar.gz - https://repo.voidlinux.eu/distfiles/rust-std-1.14.0-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/rustc-1.15.1-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/rust-std-1.15.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+=" - 0976d4d64a4b6c61d0706239880ec8c35cb4a3c46919474019c2e1d51900222b - 51147baa27f5eef372fe946f695df3f269ede92559ac3e519a794397c0fff347 + e7518b083cfa871ff84b589db754ebf9cbf727e3be37e6df4169056c9b34b45e + ac65873446807038df761ba94e00ba5aaa51efd379a69b938102773cbad7f2dc 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9" ;; x86_64) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2016-12-18/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2016-12-18/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-x86_64-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/cargo-dist/2016-11-26/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 3df0ba1f65366e9220788b13ff0b91a2c3e46bfde196d54b233038157d040a9e - 08f8cde5c305ba22052871292336d63cb493cbf38bb050ab0b8496a3536cac1c - 8ecf9bca3ece59ee291afda5fd8c371739d0d52771912c5da0d909fd9d130b3f" + 33ff44672b731fc71145974ce84194a1a9bafe6da3a74fd1e7543f12467f8894 + 69b251b478e284dfcaefc1153183f26f41d504ae213a81224f2101d8dbd52bb0 + 4a76ae206dba572e3de3f2fd7b906b42866ca4fd5f929a6f52d38579d2794e61" ;; i686) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2016-12-18/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2016-12-18/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-i686-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-i686-unknown-linux-gnu.tar.gz https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-i686-unknown-linux-gnu.tar.gz" checksum+=" - af22508823865245dc1c451d79679c33898092573608017b5b4b764b1dfe205e - 6ddbcb00893645d9c06ef2f82d60e516e618cfed03abe6deb0a18be7914d3394 + a833304f99071600c72ecd868c1c7bd5ce49d1102332637a8eb7adb942f349ab + eff452a54b208a83b35432f226cb7de046d27b5e43edfc31d71ff340af686db0 8fb0cacdd2ab32b8dbdf74ae63914e1f97baf8bac0e8c1db1414a57677b93f88" ;; esac