Date: Thursday, April 27, 2017 @ 22:28:43 Author: demize Revision: 226129
upgpkg: rust 1:1.17.0-1 Modified: rust/trunk/PKGBUILD Deleted: rust/trunk/0001-liballoc_jemalloc-fix-linking-with-system-library.patch --------------------------------------------------------------+ 0001-liballoc_jemalloc-fix-linking-with-system-library.patch | 41 ---------- PKGBUILD | 23 +---- 2 files changed, 8 insertions(+), 56 deletions(-) Deleted: 0001-liballoc_jemalloc-fix-linking-with-system-library.patch =================================================================== --- 0001-liballoc_jemalloc-fix-linking-with-system-library.patch 2017-04-27 21:49:26 UTC (rev 226128) +++ 0001-liballoc_jemalloc-fix-linking-with-system-library.patch 2017-04-27 22:28:43 UTC (rev 226129) @@ -1,41 +0,0 @@ -From 781561a6f26008a49572e156f80b577d6af60262 Mon Sep 17 00:00:00 2001 -From: Tatsuyuki Ishi <[email protected]> -Date: Fri, 3 Feb 2017 16:15:34 +0900 -Subject: [PATCH] liballoc_jemalloc: fix linking with system library - ---- - src/liballoc_jemalloc/build.rs | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs -index 1143df0c63..297f5ce99f 100644 ---- a/src/liballoc_jemalloc/build.rs -+++ b/src/liballoc_jemalloc/build.rs -@@ -42,6 +42,12 @@ fn main() { - return; - } - -+ if target.contains("android") { -+ println!("cargo:rustc-link-lib=gcc"); -+ } else if !target.contains("windows") && !target.contains("musl") { -+ println!("cargo:rustc-link-lib=pthread"); -+ } -+ - if let Some(jemalloc) = env::var_os("JEMALLOC_OVERRIDE") { - let jemalloc = PathBuf::from(jemalloc); - println!("cargo:rustc-link-search=native={}", -@@ -176,11 +182,6 @@ fn main() { - println!("cargo:rustc-link-lib=static=jemalloc_pic"); - } - println!("cargo:rustc-link-search=native={}/lib", build_dir.display()); -- if target.contains("android") { -- println!("cargo:rustc-link-lib=gcc"); -- } else if !target.contains("windows") && !target.contains("musl") { -- println!("cargo:rustc-link-lib=pthread"); -- } - - // The pthread_atfork symbols is used by jemalloc on android but the really - // old android we're building on doesn't have them defined, so just make --- -2.12.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-04-27 21:49:26 UTC (rev 226128) +++ PKGBUILD 2017-04-27 22:28:43 UTC (rev 226129) @@ -6,7 +6,7 @@ pkgname=('rust' 'rust-docs') epoch=1 -pkgver=1.16.0 +pkgver=1.17.0 pkgrel=1 pkgdesc='Systems programming language focused on safety, speed and concurrency' @@ -14,25 +14,16 @@ arch=('x86_64' 'i686') license=('MIT' 'Apache') -makedepends=('libffi' 'perl' 'python2' 'curl' 'llvm' 'jemalloc') +makedepends=('rust' 'cargo' 'libffi' 'perl' 'python2' 'curl' 'llvm' 'jemalloc') options=('!emptydirs') -source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} - 0001-liballoc_jemalloc-fix-linking-with-system-library.patch) +source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}) -sha256sums=('f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4' - 'SKIP' - 'b61d9aae58925b222cd44d7b41f0aa648fde89a48e7772aa659acd0d74dde612') +sha256sums=('4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87' + 'SKIP') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <[email protected]> -prepare() { - cd "rustc-$pkgver-src" - - # Backport of https://github.com/rust-lang/rust/pull/39481 - patch -p1 <"$srcdir"/0001-liballoc_jemalloc-fix-linking-with-system-library.patch -} - build() { cd "rustc-$pkgver-src" @@ -40,8 +31,10 @@ --prefix=/usr \ --release-channel=stable \ --llvm-root=/usr \ + --enable-llvm-link-shared \ --disable-codegen-tests \ - --jemalloc-root=/usr/lib + --jemalloc-root=/usr/lib \ + --enable-local-rust export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi"
