From 255e0316590f2a18f6f7025ff7cfb673daeadc98 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 20 Aug 2019 12:41:08 +0000
Subject: [PATCH] extra/rust to 1.37.0-2

---
 extra/rust/PKGBUILD    | 17 +++++++++++++----
 extra/rust/config.toml |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD
index 1b5f43e84..861ca9fba 100644
--- a/extra/rust/PKGBUILD
+++ b/extra/rust/PKGBUILD
@@ -17,25 +17,31 @@ highmem=1
 pkgname=('rust' 'rust-docs')
 epoch=1
 pkgver=1.37.0
-pkgrel=1
+pkgrel=2
+
+_llvm_ver=8.0.1
 
 pkgdesc='Systems programming language focused on safety, speed and concurrency'
 url='https://www.rust-lang.org/'
 arch=('x86_64')
 license=('MIT' 'Apache')
 
-makedepends=('rust' 'llvm' 'libffi' 'perl' 'python' 'curl' 'cmake')
+makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
 checkdepends=('procps-ng' 'gdb')
 
 options=('!emptydirs')
 
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
         config.toml)
 
 sha256sums=('120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3'
             'SKIP'
-            'd8076a0e894c179897856e61b277fed271b93f32653e23d7ad9e4d2b9418ef64')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+            '11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837'
+            'SKIP'
+            '4773c50dca4ee344e33ea9ef3af89647fedef1ede5cbc2d3a8e57afd88a979cc')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
 
 prepare() {
   cd "rustc-$pkgver-src"
@@ -55,6 +61,9 @@ prepare() {
 build() {
   cd "rustc-$pkgver-src"
 
+  export RUST_BACKTRACE=1
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
   python ./x.py build $jobs
 }
 
diff --git a/extra/rust/config.toml b/extra/rust/config.toml
index f2b3b2413..6d3107fa7 100644
--- a/extra/rust/config.toml
+++ b/extra/rust/config.toml
@@ -7,6 +7,8 @@ rustc = "/usr/bin/rustc"
 python = "python"
 extended = true
 sanitizers = false
+profiler = true
+local-rebuild = false
 
 [install]
 prefix = "/usr"