cargo: update to 0.54.0.
And use rust 1.53.0 as bootstrap.
This commit is contained in:
Érico Nogueira
q66
parent
af802e87d4
commit
3b4acd0b55
3 changed files with 39 additions and 29 deletions
11
srcpkgs/cargo/patches/crossbeam-ppcle.patch
Normal file
11
srcpkgs/cargo/patches/crossbeam-ppcle.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/crossbeam-utils/no_atomic.rs
|
||||
+++ b/crossbeam-utils/no_atomic.rs
|
||||
@@ -33,6 +33,8 @@ const NO_ATOMIC_64: &[&str] = &[
|
||||
"powerpc-unknown-linux-gnu",
|
||||
"powerpc-unknown-linux-gnuspe",
|
||||
"powerpc-unknown-linux-musl",
|
||||
+ "powerpcle-unknown-linux-gnu",
|
||||
+ "powerpcle-unknown-linux-musl",
|
||||
"powerpc-unknown-netbsd",
|
||||
"powerpc-unknown-openbsd",
|
||||
"powerpc-wrs-vxworks",
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
|
||||
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
|
||||
index 758f5c23f1..a70cd0dce8 100644
|
||||
--- a/src/cargo/util/config/de.rs
|
||||
+++ b/src/cargo/util/config/de.rs
|
||||
@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
|
||||
seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
|
||||
}
|
||||
Definition::Environment(env) => {
|
||||
- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
|
||||
+ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
|
||||
}
|
||||
Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'cargo'
|
||||
pkgname=cargo
|
||||
version=0.49.0
|
||||
revision=2
|
||||
version=0.54.0
|
||||
revision=1
|
||||
wrksrc="cargo-${version}"
|
||||
build_helper=rust
|
||||
hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"
|
||||
|
|
@ -11,8 +11,10 @@ short_desc="Rust package manager"
|
|||
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=59ba1ce05becb4a5e0772d334d75f9dce3d5487ca288ac986e786241bb1cbac5
|
||||
distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz
|
||||
https://github.com/crossbeam-rs/crossbeam/archive/refs/tags/crossbeam-utils-0.8.5.tar.gz"
|
||||
checksum="4627e7eb0be3150d878ed695a1ef874885ff84325019499af61f5e3ade410d4b
|
||||
57db07eb38b0aaf7951c79b4639819cb84bc4269507091afea7267e10a54e079"
|
||||
replaces="cargo-tree>=0"
|
||||
|
||||
build_options="static bindist"
|
||||
|
|
@ -21,14 +23,14 @@ desc_option_bindist="Generate a tarball for bootstrap"
|
|||
# rust upstream no longer ships cargo-versioned tarballs
|
||||
# need to use the corresponding rust version instead
|
||||
_bootstrap_url="https://static.rust-lang.org/dist"
|
||||
_cargo_dist_version="1.48.0"
|
||||
_cargo_dist_version="1.53.0"
|
||||
|
||||
case "$XBPS_MACHINE" in
|
||||
x86_64*|i686|ppc64le) ;;
|
||||
ppc*)
|
||||
# custom bootstrap tarballs still use cargo versioning, so override
|
||||
_bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles"
|
||||
_cargo_dist_version="0.49.0"
|
||||
_cargo_dist_version="0.54.0"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -45,39 +47,39 @@ distfiles+=" ${_bootstrap_url}/cargo-${_cargo_dist_version}-${RUST_BUILD}.tar.xz
|
|||
case "$XBPS_MACHINE" in
|
||||
i686)
|
||||
checksum+="
|
||||
1eab76df91e87198632605752d0dd66f3d84b502cbd1f982f6db3d0d8d943cdb"
|
||||
deebb4a4de22a60f0dec5d5b84e8dfe6ce039835935dae96477a79468aefd927"
|
||||
;;
|
||||
x86_64)
|
||||
checksum+="
|
||||
b11d595581e2580c069b5039214e1031a0e4f87ff6490ac39f92f77857e37055"
|
||||
e4437f6c83574fc60e183f4df439190f7610e4a669476802795645da66fbb83b"
|
||||
;;
|
||||
x86_64-musl)
|
||||
checksum+="
|
||||
8728cb7515e593f6fcf3c7afba826a92cd227a35b8e936bae892b95482d4fb90"
|
||||
ca236408cb2c35b8c3f7c2b4e9f1e69422ed24153f445192eafb6462351e5c2b"
|
||||
;;
|
||||
ppc64le)
|
||||
checksum+="
|
||||
675321cf812a132ce707261d03aab2f5ff64788ae66b45d03bc281514f5d53ec"
|
||||
ca1d94161c3a4021bca170ba4ca059b5606fcd70934aca89d8cea43746880ba7"
|
||||
;;
|
||||
ppc64le-musl)
|
||||
checksum+="
|
||||
cf02e057f04e40458b63326e443c48924c78fc33dcb6b892643d47feb1496b09"
|
||||
1181b721addeb2aa471bf71549a7fb09f27167c382b480cefba272f770b9f039"
|
||||
;;
|
||||
ppc64)
|
||||
checksum+="
|
||||
1e7612ea1900b76924429fa04fa2c194f4213167933b481001290dd4fef27939"
|
||||
7d9b0428d4cd8cdd76582b3113476228013ec0b674802f18b4b5e8bbefcd3ab2"
|
||||
;;
|
||||
ppc64-musl)
|
||||
checksum+="
|
||||
88ffadd53e79055ba266f1303d502bcf1ef863783b121aa017930cadcd0e398d"
|
||||
695d687c19a729504ac8b57a42e395258a8b801753baf1b0b17755d7f38f7eaa"
|
||||
;;
|
||||
ppc)
|
||||
checksum+="
|
||||
cacacdec7bfd24345804efdd1bd1682084880c3c6a086bcab85cd1186b6cd230"
|
||||
176f178b9e55f399311edb4888d931e5f696766f655cc9648ae4b6ef1bdc8369"
|
||||
;;
|
||||
ppc-musl)
|
||||
checksum+="
|
||||
bad4a5d22da3c7548fd440d0d5a0b98e4de9894dedb35bfb58aaa5f141c23adb"
|
||||
234cf0792407065f4c5c4276886846cee2ecfb37eea1171c2c6e4a0fba7d324c"
|
||||
;;
|
||||
*) broken="bootstrap binary unavailable for ${XBPS_MACHINE}";;
|
||||
esac
|
||||
|
|
@ -85,6 +87,17 @@ esac
|
|||
post_extract() {
|
||||
mkdir -p target/snapshot
|
||||
cp ../cargo-${_cargo_dist_version}-${RUST_BUILD}/cargo/bin/cargo cargo
|
||||
mv ../crossbeam-* crossbeam-utils
|
||||
}
|
||||
|
||||
post_patch() {
|
||||
rm crossbeam-utils/crossbeam-utils/no_atomic.rs
|
||||
cp crossbeam-utils/no_atomic.rs crossbeam-utils/crossbeam-utils
|
||||
|
||||
cat >> Cargo.toml <<- EOF
|
||||
[patch.crates-io]
|
||||
crossbeam-utils = { path = './crossbeam-utils/crossbeam-utils' }
|
||||
EOF
|
||||
}
|
||||
|
||||
do_build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue