Date: Tuesday, October 25, 2016 @ 18:24:50 Author: arodseth Revision: 193362
upgpkg: rust 1:1.12.1-1 Modified: rust/trunk/PKGBUILD ----------+ PKGBUILD | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-25 17:08:21 UTC (rev 193361) +++ PKGBUILD 2016-10-25 18:24:50 UTC (rev 193362) @@ -1,10 +1,11 @@ # $Id$ # Maintainer: Alexander F Rødseth <xypr...@archlinux.org> # Contributor: Daniel Micay <danielmi...@gmail.com> +# Contributor: userwithuid <userwith...@gmail.com> pkgname=('rust' 'rust-docs') epoch=1 -pkgver=1.12.0 +pkgver=1.12.1 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Systems programming language focused on safety, speed and concurrency' @@ -11,10 +12,9 @@ url='http://www.rust-lang.org/' groups=('rust') license=('MIT' 'Apache') -makedepends=('libffi' 'perl' 'python2' 'curl' 'jemalloc' 'cmake') -depends=('gcc') +makedepends=('libffi' 'perl' 'python2' 'curl' 'llvm' 'cmake' 'ninja') source=("http://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}) -sha256sums=('ac5907d6fa96c19bd5901d8d99383fb8755127571ead3d4070cce9c1fb5f337a' +sha256sums=('97913ae4cb255618aaacd1a534b11f343634b040b32656250d09d8d9ec02d3dc' 'SKIP') options=('staticlibs' '!strip' '!emptydirs') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-...@rust-lang.org> @@ -23,34 +23,46 @@ build() { cd "rustc-$pkgver" - ./configure --prefix=/usr --release-channel=stable - make CFLAGS="$CFLAGS -fPIC -w" + ./configure \ + --prefix=/usr \ + --release-channel=stable \ + --enable-ninja \ + --llvm-root=/usr \ + --disable-codegen-tests + + export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" + export CFLAGS="$CFLAGS -fPIC -w" + + make } package_rust() { - depends=('gcc') + depends=('gcc-libs' 'llvm-libs') cd "rustc-$pkgver" make DESTDIR="$pkgdir" install - install -Dm644 LICENSE-APACHE \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE-APACHE" - install -Dm644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname/LICENSE-MIT" + for license in APACHE MIT; do install -Dm644 "LICENSE-$license" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done cd "$pkgdir/usr/lib" + 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/" } package_rust-docs() { - cd "rustc-$pkgver" + msg2 "Packaging documentation" + install -d "$pkgdir/usr/share/doc/" + mv "$srcdir/doc" "$pkgdir/usr/share/doc/rust" - install -d "$pkgdir/usr/share/doc/rust" - cp -r "doc/"* "$pkgdir/usr/share/doc/rust" - install -Dm644 LICENSE-APACHE \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE-APACHE" - install -Dm644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname/LICENSE-MIT" + msg2 "Packaging license files for the documentation" + for license in APACHE MIT; do install -Dm644 "rustc-$pkgver/LICENSE-$license" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done } # vim:set ts=2 sw=2 et: