Commit 077fdfdc authored by Jeff Huang's avatar Jeff Huang 🤔
Browse files

rust: update to 1.16.0

parent f46d8ab8
From 781561a6f26008a49572e156f80b577d6af60262 Mon Sep 17 00:00:00 2001
From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
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
......@@ -3,34 +3,41 @@
# Arch Contributor: Daniel Micay <danielmicay@gmail.com>
pkgname=rust
pkgver=1.15.1
pkgver=1.16.0
pkgrel=1
arch=('x86_64')
pkgdesc='Systems programming language focused on safety, speed and concurrency'
url='https://www.rust-lang.org/'
license=('MIT' 'Apache')
depends=('gcc-libs' 'llvm-libs')
makedepends=('libffi' 'perl' 'python2' 'curl' 'cmake' 'ninja' 'jemalloc' 'llvm')
source=("http://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz")
sha256sums=('2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327')
makedepends=('libffi' 'perl' 'python2' 'curl' 'jemalloc' 'llvm')
optdepends=('cargo')
source=("http://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"
0001-liballoc_jemalloc-fix-linking-with-system-library.patch)
sha256sums=('f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4'
'b61d9aae58925b222cd44d7b41f0aa648fde89a48e7772aa659acd0d74dde612')
install="$pkgname.install"
options=('staticlibs' '!strip' '!emptydirs')
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"
./configure --prefix=/usr \
--release-channel=stable \
--enable-ninja \
--llvm-root=/usr \
--disable-codegen-tests \
--jemalloc-root=/usr/lib \
--disable-rustbuild
--jemalloc-root=/usr/lib
export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi"
export CFLAGS="$CFLAGS -fPIC -w"
make
python2 ./x.py build --verbose
}
package() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment