cargo: update to 0.33.0.

srcpkgs/cargo/template

@@ -1,7 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=0.32.0
+version=0.33.0
 revision=1
+build_helper=rust
 hostmakedepends="rust python curl cmake pkg-config"
 makedepends="libcurl-devel libgit2-devel"
 depends="rust"
@@ -10,8 +11,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz"
-checksum=c62e41489179a9b8e1ae0dbed379c278f9de805abba41608a05c069478a739fd
-_cargo_dist_version=0.32.0
+checksum=914d715ff1a4ac4280b63d05c0f848d38889900a5559888d4a20c9600f87e6a4
+_cargo_dist_version=0.33.0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cargo"
@@ -22,37 +23,37 @@ else
 		distfiles+="
 		 https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.xz"
 		checksum+="
-		 4dfb1cca7730b38920c04731be0e9d47ec520b3365059b4ccd9c0948346787ea"
+		 6c519f5103e422650c3f69ac9b19303f829e9f9bb7e088d84dcd0318fd1b56c0"
 		;;
 	x86_64)
 		distfiles+="
 		 https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.gz"
 		checksum+="
-		 b3d3dc57182fb173ecf367f7884dceb855a096d9b9b32eba994e3359ddc68cd4"
+		 9dd7f79a0ab882ed7c892731514a4aed6435f7bc8a20381a8346b471c8a14209"
 		;;
 	i686)
 		distfiles+="
 		 https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.gz"
 		checksum+="
-		 0dcb32f2b17f505b5b74e85ffcc7fa6902d600a4f5767f43303761f7cd27efa9"
+		 163f46bd84ba6348dfe1ac3c10bc4730059f321791d2a7d4d4704fe8ddf8a755"
 		;;
 	ppc64le)
 		distfiles+="
 		 https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-gnu.tar.xz"
 		checksum+="
-		 bf426e52beb08e0f663b00b23a89053e713ec15c8e6d69b3f5ae85fe23ad7e18"
+		 bd22f3c2fad2be544a80c890a659cb5f1c5bf2d80f3f6a14be23d19000545d01"
 		;;
 	ppc64le-musl)
 		distfiles+="
 		 https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64le-unknown-linux-musl.tar.xz"
 		checksum+="
-		 d9d91997a781753474e89dbb9b7dbbef2f6cfad9387def076d51d654f6bc21fa"
+		 1db7c45306e3a424620ac2c6d07374a6ea0e3c6be0d3a546393188bf1fea1f02"
 		;;
 	ppc64-musl)
 		distfiles+="
 		 https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-powerpc64-unknown-linux-musl.tar.xz"
 		checksum+="
-		 ec846d1e9674f60dbd4416d54f74a618288114cea4907b61363adc71b3c8c26f"
+		 a6b3f9ba055bb78ae70d31aed05d37969dee864fc003135f34f1bb92b6cd13b5"
 		;;
 	esac
 fi
@@ -66,23 +67,8 @@ post_extract() {
 		esac
 	fi
 }
-do_configure() {
-	mkdir -p .cargo
-
-	cat >> .cargo/config <<EOF
-[build]
-jobs = ${makejobs#*j}
-target = "${RUST_TARGET}"
-[target.${RUST_TARGET}]
-linker = "${CC}"
-EOF
-}
 
 do_build() {
-	export LIBGIT2_SYS_USE_PKG_CONFIG=yes
-	export RUST_BACKTRACE=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-	export RUSTFLAGS="--sysroot=${XBPS_CROSS_BASE}/usr"
 	if [ "$CROSS_BUILD" ]; then
 		cargo build --release
 	else
@@ -91,7 +77,11 @@ do_build() {
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/cargo
+	if [ "$CROSS_BUILD" ]; then
+		vbin target/${RUST_TARGET}/release/cargo
+	else
+		vbin target/release/cargo
+	fi
 	for f in src/etc/man/*.?; do
 		vman $f
 	done