cargo: update to 0.40.0

This commit is contained in:
q66 2019-11-08 13:47:33 +01:00 committed by Helmut Pozimski
parent d94f88a684
commit bd1944e484

View file

@ -1,6 +1,6 @@
# Template file for 'cargo' # Template file for 'cargo'
pkgname=cargo pkgname=cargo
version=0.39.0 version=0.40.0
revision=1 revision=1
wrksrc="cargo-${version}" wrksrc="cargo-${version}"
build_helper=rust build_helper=rust
@ -11,10 +11,11 @@ short_desc="Rust package manager"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0" license="MIT, Apache-2.0"
homepage="https://crates.io/" homepage="https://crates.io/"
_libgit2_ver=0.9.1
distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz
https://github.com/rust-lang/git2-rs/archive/libgit2-sys-0.8.2.tar.gz" https://github.com/rust-lang/git2-rs/archive/libgit2-sys-${_libgit2_ver}.tar.gz"
checksum="1fade63d5c09eab6fa234a1fdf64693ccf1b63398a316ad27edeb1f76ee4a57e checksum="b0a6808a2eaa9b20ccaeedeb04f583ee34b33d289f4d0076044b9fc2b1f4c59d
c6597bcdc2be7a2fd70c1bb8fdc75883ca5df6aea33f0354c5a8124eacc0938b" 81e20fa9a0f6ea3e3a0e6458148f3dea4a89af87d34128d4375f2b7fd661a49c"
_cargo_dist_version=0.39.0 _cargo_dist_version=0.39.0
build_options="static" build_options="static"
@ -79,8 +80,8 @@ post_extract() {
cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo
fi fi
# need this for the patch to work mv ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-${_libgit2_ver} .
cp -R ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-0.8.2/libgit2-sys . mv git2-rs-libgit2-sys-${_libgit2_ver}/libgit2-sys .
} }
post_patch() { post_patch() {
@ -110,6 +111,9 @@ do_build() {
cargo="./cargo" cargo="./cargo"
fi fi
# gotta pin out libgit2-sys at the version
$cargo update
$cargo update --package libgit2-sys --precise ${_libgit2_ver}
$cargo build --release $(vopt_if static --features="all-static") $cargo build --release $(vopt_if static --features="all-static")
} }