From 28111aaea8323843bfd74abc830a763f2877bf43 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Tue, 20 Mar 2018 13:17:21 +0100
Subject: [PATCH] rust: update to 1.24.1.

Use bundled llvm
---
 srcpkgs/rust/template | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index af65dc5a58..3c4f30e6fc 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,8 +1,8 @@
 # Template file for 'rust'
 pkgname=rust
-version=1.24.0
+version=1.24.1
 revision=1
-_date=2018-01-04
+_date=2018-03-20
 _rust_dist_version=1.24.0
 _cargo_dist_version=0.25.0
 # NB. if you push any(!) new version, don't forget to put a build
@@ -14,13 +14,13 @@ build_style=configure
 make_build_args="dist VERBOSE=1"
 only_for_archs="i686 x86_64 x86_64-musl"
 hostmakedepends="cmake curl pkg-config python"
-makedepends="libffi-devel llvm3.9 ncurses-devel zlib-devel"
+makedepends="libffi-devel ncurses-devel zlib-devel"
 short_desc="Safe, concurrent, practical systems language"
 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=bb8276f6044e877e447f29f566e4bbf820fa51fea2f912d59b73233ffd95639f
+checksum=3ea53d45e8d2e9a41afb3340cf54b9745f845b552d802d607707cf04450761ef
 
 case "$XBPS_MACHINE" in
 x86_64-musl)
@@ -37,30 +37,28 @@ x86_64-musl)
 x86_64)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://static.rust-lang.org/dist/${_date}/rustc-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/${_date}/rust-std-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/${_date}/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.xz"
+	 https://static.rust-lang.org/dist/rustc-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.xz"
 	checksum+="
-	 27b124fd0d94c082978ff81e45f7b7c37e91d64714587829bf828d64d76524ee
-	 83c7351bdc4326caf785c208cff86682825dad4a89ccee705fa05f55ce7bd25b
-	 93b953c8c7a2088aef952de8dccd7f6ccf9b21bf94b735d3909961ffe831da8c"
+	 229fecc14e725d5dc2ce264925b362232649813cc436c51fab8ea376831f8d77
+	 11f2a4fb8a7474e22dce61893b721dc54d9090bc7c784d17366a9a27541765ad
+	 9cad9675f7e48d7792b931d662031c6b9f6b834b048108be3615eac38ef5303a"
 	;;
 i686)
 	# extract from src/stage0.txt
 	distfiles+="
-	 https://static.rust-lang.org/dist/${_date}/rustc-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/${_date}/rust-std-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
-	 https://static.rust-lang.org/dist/${_date}/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.xz"
+	 https://static.rust-lang.org/dist/rustc-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
+	 https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.xz"
 	checksum+="
-	 bbfd1267f57e70c7e6d3b65e7b5d577c97e647b4326abc890d84acc236a6fc47
-	 e39b3a60898026ad01bdb136e0a58a02a9da61dbbfb348661e6fe199923617a9
-	 6ffc847e0ee2a1273223ce500f7b212d051e99a6d234e34585d0c55e21a963ea"
+	 6b7b6b3608648a8106fee51463c4fc73399dcf8a0657431e66734a7f6a0d4305
+	 65197a0d01c5650f00fd5edfc427b7b5b33e2c8ea96ffb40924b819012646033
+	 7f06f92a3013d2f54be69ccaa148979bf5d6e95b57d3c48981b28b0b3feb78d3"
 	;;
 esac
 
 post_extract() {
-	rm -rf src/llvm
-
 	mkdir -p stage0
 	cp -flr ../rustc-*/rustc/* stage0
 	cp -flr ../rust-std-*/rust-std-*/* stage0
@@ -120,7 +118,6 @@ do_configure() {
 		--disable-docs
 		--disable-codegen-tests
 		--enable-ccache
-		--llvm-root=/usr
 		--enable-local-rust
 		--local-rust-root=$wrksrc/stage0
 	"