[arch-commits] Commit in rust/trunk (PKGBUILD config.toml)

[Johannes Löthberg]

    Date: Tuesday, October 9, 2018 @ 15:35:09
  Author: demize
Revision: 391642

upgpkg: rust 1:1.29.1-1

Also build with system LLVM

Modified:
  rust/trunk/PKGBUILD
  rust/trunk/config.toml

-------------+
 PKGBUILD    |   27 +++++++++++----------------
 config.toml |    6 +++---
 2 files changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-09 14:12:34 UTC (rev 391641)
+++ PKGBUILD	2018-10-09 15:35:09 UTC (rev 391642)
@@ -7,8 +7,8 @@
 
 pkgname=('rust' 'rust-docs')
 epoch=1
-pkgver=1.29.0
-pkgrel=2
+pkgver=1.29.1
+pkgrel=1
 
 pkgdesc='Systems programming language focused on safety, speed and concurrency'
 url='https://www.rust-lang.org/'
@@ -15,24 +15,22 @@
 arch=('x86_64')
 license=('MIT' 'Apache')
 
-makedepends=('rust' 'libffi' 'perl' 'python2' 'curl' 'cmake' 'ninja')
+makedepends=('rust' 'llvm' 'libffi' 'perl' 'python2' 'curl' 'cmake')
+checkdepends=('procps-ng' 'gdb')
 
 options=('!emptydirs')
 
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        config.toml
-        https://github.com/rust-lang/rust/commit/1b94b84ad0143ea2039610e3aec9e929a8a20733.patch)
+        config.toml)
 
-sha256sums=('a4eb34ffd47f76afe2abd813f398512d5a19ef00989d37306217c9c9ec2f61e9'
+sha256sums=('f1b0728b66ce6bce6d72bbe5ea9e3a24ea22a045665da2ed8fcdfad14f61a349'
             'SKIP'
-            'ff4890bd733509b0dbb885d69afd578c41fc583af256dcc81e9239339c60b144'
-            '8c8e79b0bac0dd1434c49f665abfa50634ffb0fbb35c9efee511e5b97960b9e2')
+            'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
 
 prepare() {
   cd "rustc-$pkgver-src"
 
-  patch -p1 <"$srcdir"/1b94b84ad0143ea2039610e3aec9e929a8a20733.patch
   cp "$srcdir"/config.toml config.toml
 }
 
@@ -39,17 +37,15 @@
 build() {
   cd "rustc-$pkgver-src"
 
-  msg2 "Run build under x.py"
-  python2 ./x.py build
+  python2 ./x.py build -j"$(nproc)"
 }
 
 package_rust() {
-  depends=('gcc-libs' 'curl' 'libssh2')
+  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
   provides=('cargo' 'rustfmt')
   conflicts=('cargo' 'rustfmt')
   replaces=('cargo' 'rustfmt')
 
-
   cd "rustc-$pkgver-src"
 
   DESTDIR="$pkgdir" python2 ./x.py install
@@ -62,8 +58,8 @@
   rm rustlib/{components,manifest-rustc,rust-installer-version}
   ln -sf rustlib/$CARCH-unknown-linux-gnu/lib/*.so .
 
-  # move docs out of the way
-  mv "$pkgdir/usr/share/doc" "$srcdir/"
+  # move docs out of the way for splitting
+  mv "$pkgdir"/usr/share/doc "$srcdir"
 
   install -d "$pkgdir"/usr/share/bash-completion
   mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
@@ -70,7 +66,6 @@
 }
 
 package_rust-docs() {
-  msg2 "Packaging documentation"
   install -d "$pkgdir/usr/share/doc/"
   mv "$srcdir"/doc/* "$pkgdir"/usr/share/doc/rust/
 

Modified: config.toml
===================================================================
--- config.toml	2018-10-09 14:12:34 UTC (rev 391641)
+++ config.toml	2018-10-09 15:35:09 UTC (rev 391642)
@@ -1,5 +1,5 @@
 [llvm]
-ninja = true
+link-shared = true
 
 [build]
 cargo = "/usr/bin/cargo"
@@ -23,5 +23,5 @@
 
 rpath = false
 
-# Work around https://github.com/rust-lang/rust/issues/51650
-deny-warnings = false
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"