Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=49042af5143f4d1ff50dd36ed51819f2715a1029
commit 49042af5143f4d1ff50dd36ed51819f2715a1029 Author: crazy <[email protected]> Date: Sun Dec 3 20:01:33 2017 +0100 rust-1.22.1-1-x86_64 * Version bump 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 deleted file mode 100644 index 003059d..0000000 --- a/source/devel/rust/0001-liballoc_jemalloc-fix-linking-with-system-library.patch +++ /dev/null @@ -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 - diff --git a/source/devel/rust/FrugalBuild b/source/devel/rust/FrugalBuild index 952d37e..f93e27e 100644 --- a/source/devel/rust/FrugalBuild +++ b/source/devel/rust/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy <[email protected]> pkgname=rust -pkgver=1.21.0 +pkgver=1.22.1 pkgrel=1 pkgdesc="Programming language focused on safety, speed and concurrency" url="https://www.rust-lang.org/"; @@ -12,11 +12,10 @@ 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=('f835d72bc26ee6f25f6e5d6783b424fc9b904c9e') +sha1sums=('05e5d569ba3737e4b596bef4f4d0cb69f888e69d') _F_cd_path="rustc-${pkgver}-src" options+=('static' 'nostrip') Fconfopts+=" --jemalloc-root=/usr/lib \ - --disable-clang \ --libdir=/usr/lib \ --enable-ccache \ --disable-docs \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
