From 82b78f01ba6e68c755d9190f8d2a2c13a07b7b60 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 30 Sep 2016 15:58:00 +0200 Subject: [PATCH] cargo: update to 0.13.0. --- .../cargo/patches/musl-NFS_SUPER_MAGICK.patch | 21 ------------------- srcpkgs/cargo/template | 11 +++++----- 2 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/cargo/patches/musl-NFS_SUPER_MAGICK.patch diff --git a/srcpkgs/cargo/patches/musl-NFS_SUPER_MAGICK.patch b/srcpkgs/cargo/patches/musl-NFS_SUPER_MAGICK.patch deleted file mode 100644 index 415766ad915..00000000000 --- a/srcpkgs/cargo/patches/musl-NFS_SUPER_MAGICK.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/rust-lang/cargo/issues/2937 ---- a/src/cargo/util/flock.rs -+++ b/src/cargo/util/flock.rs -@@ -282,7 +282,7 @@ - human(format!("failed to lock file: {}", path.display())) - }); - -- #[cfg(target_os = "linux")] -+ #[cfg(all(target_os = "linux", not(target_env = "musl")))] - fn is_on_nfs_mount(path: &Path) -> bool { - use std::ffi::CString; - use std::mem; -@@ -302,7 +302,7 @@ - } - } - -- #[cfg(not(target_os = "linux"))] -+ #[cfg(any(not(target_os = "linux"), target_env = "musl"))] - fn is_on_nfs_mount(_path: &Path) -> bool { - false - } diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 47f595eb77a..c14ae4d36ce 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=0.12.0 +version=0.13.0 revision=1 -_githash_installer=c37d3747da75c280237dc2d6b925078e69555499 +_githash_installer=755bc3db4ff795865ea31b5b4f38ac920d8acacb patch_args="-Np1" build_style=gnu-configure make_build_args="VERBOSE=1" @@ -15,8 +15,8 @@ license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz" -checksum="4080d76b56b8202f7df271b4bb7d7d22abea5ff8c261aef42e6e5d248ca5972b - 6326434c225d25c6bfd28ff8bbc3108e331ae65e89a5c38dac8a2c8ffa09732b" +checksum="90429180d3724385acb094f2896feea0c73690451a92215d6054d05edf4a5c49 + 2cf7a1b8920970b163bc9968685cd32234b7785a6d057a0d3b0d043110de81c7" nocross=yes case "$XBPS_MACHINE" in @@ -28,7 +28,7 @@ x86_64-musl) ;; x86_64) distfiles+=" - https://static.rust-lang.org/cargo-dist/2016-04-10/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/cargo-dist/2016-07-05/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" checksum+=" 721a2bfb1f2ffff09b59911ba686a3a55eac6a2df88f19168be0a7c8a1fdffca" ;; @@ -40,6 +40,7 @@ post_extract() { sed -i 's,/etc/bash_completion.d,/share/bash-completion/completions,g' Makefile.in mkdir -p target/snapshot mv ../cargo-nightly*/cargo/* target/snapshot + sed -i '/dl-snapshot/d' Makefile.in } pre_configure() { configure_args+=" --host=${XBPS_TRIPLET/-pc-/-unknown-} --build=${XBPS_TRIPLET/-pc-/-unknown-}"