Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fda24f9cf98b5fb887f3df032fac2a37787a82c3
commit fda24f9cf98b5fb887f3df032fac2a37787a82c3 Author: DeX77 <[email protected]> Date: Fri Apr 21 21:28:01 2017 +0200 rust-1.16.0-1-x86_64 * version bump * use in-tree llvm until llvm 4.0 is supported diff --git a/source/devel/rust/0001-liballoc_jemalloc-fix-linking-with-system-library.patch b/source/devel/rust/0001-liballoc_jemalloc-fix-linking-with-system-library.patch new file mode 100644 index 0000000..003059d --- /dev/null +++ b/source/devel/rust/0001-liballoc_jemalloc-fix-linking-with-system-library.patch @@ -0,0 +1,41 @@ +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 + diff --git a/source/devel/rust/FrugalBuild b/source/devel/rust/FrugalBuild index 67ad373..8689eea 100644 --- a/source/devel/rust/FrugalBuild +++ b/source/devel/rust/FrugalBuild @@ -2,28 +2,37 @@ # Maintainer: crazy <[email protected]> pkgname=rust -pkgver=1.14.0 +pkgver=1.16.0 pkgrel=1 pkgdesc="Programming language focused on safety, speed and concurrency" url="https://www.rust-lang.org/"; -depends=('llvm-libs>=3.9.0' 'libffi' 'zlib') -makedepends=('curl' 'python' 'perl' 'jemalloc' 'git' 'llvm>=3.9.0' 'cmake' 'ninja') +depends=('libffi' 'zlib') # 'llvm-libs>=4.0.0') +makedepends=('curl' 'python' 'perl' 'jemalloc' 'git' 'cmake' 'ninja') # 'llvm' ) groups=('devel') archs=("x86_64") up2date="lynx -dump https://www.rust-lang.org/en-US/other-installers.html | grep -m1 '\-src.tar.gz' | sed 's/.*rustc-\(.*\)-.*/\1/'" -source=(https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.gz) -sha1sums=('f6ea4e39c8a666f73297dbf5953f6c2bc2b607ad') -_F_cd_path="rustc-${pkgver}" +source=(https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.gz \ + 0001-liballoc_jemalloc-fix-linking-with-system-library.patch) +sha1sums=('c0a66ad539b1ca9f3b1d174f4a233228cb422cd7' \ + '1c2600512729389c9691d31bbae7a1f671031b27') +_F_cd_path="rustc-${pkgver}-src" options+=('static' 'nostrip') -Fconfopts+=" --jemalloc-root=/usr/lib \ - --llvm-root=/usr \ +Fconfopts+=" --jemalloc-root=/usr/lib \ --disable-clang \ --libdir=/usr/lib \ --enable-ccache \ --disable-docs \ --disable-codegen-tests \ --release-channel=stable \ + --prefix=/usr \ --enable-ninja" _F_make_opts+=" VERBOSE=1" +build() { + Fcd + Fpatchall + Fmake + Fmakeinstall DESTDIR=$Fdestdir +} + # optimization ok _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
