aboutsummaryrefslogtreecommitdiffstats
path: root/testing/cargo
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2016-12-08 03:09:13 +0100
committerJakub Jirutka <jakub@jirutka.cz>2016-12-08 03:10:41 +0100
commit7fce411e6d7a5c9093dea89e0749c7bb2b67e0c5 (patch)
treed9bc76bd175485b12f8d642bbbeaf826a4351904 /testing/cargo
parenta09905b5f2fc74840690c334d4b22d7dcc4ef8ab (diff)
downloadaports-7fce411e6d7a5c9093dea89e0749c7bb2b67e0c5.tar.bz2
aports-7fce411e6d7a5c9093dea89e0749c7bb2b67e0c5.tar.xz
testing/cargo: replace custom bootstrap binary with one from upstream
Diffstat (limited to 'testing/cargo')
-rw-r--r--testing/cargo/APKBUILD16
1 files changed, 6 insertions, 10 deletions
diff --git a/testing/cargo/APKBUILD b/testing/cargo/APKBUILD
index 58c9a3a627..778ee08ec0 100644
--- a/testing/cargo/APKBUILD
+++ b/testing/cargo/APKBUILD
@@ -13,14 +13,10 @@ subpackages="$pkgname-doc
$pkgname-bash-completion:bashcomp:noarch
$pkgname-zsh-completion:zshcomp:noarch"
-# XXX: Cargo is self-hosted, so you need cargo to build cargo (ugh).
-# The problem is that Rust doesn't provide prebuilt cargo for musl yet. Thus
-# I bootstrapped cargo using cargo-bootstrap and uploaded the built tarball
-# to my server. We're gonna replace it once Rust start providing prebuilt
-# binary for musl.
+# NOTE: Cargo is self-hosted, so you need cargo to build cargo (ugh).
# TODO: Implement some support for verifying crates fetched by cargo!
source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/$pkgname/archive/$pkgver.tar.gz
- https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
+ https://s3.amazonaws.com/rust-lang-ci/cargo-builds/333a79884d2463b11f279d815284b6406656c949/cargo-nightly-x86_64-unknown-linux-musl.tar.gz
fix-release-num.patch"
builddir="$srcdir/$pkgname-$pkgver"
@@ -36,7 +32,7 @@ build() {
--prefix=/usr \
--local-cargo="$srcdir/cargo-nightly-$_ctarget/cargo/bin/cargo" \
|| return 1
- make VERBOSE=1
+ make CARGOFLAGS="--locked" VERBOSE=1
}
package() {
@@ -73,11 +69,11 @@ _mv() {
}
md5sums="d789a7785e37a1f299b24bc4b57f98ff cargo-0.14.0.tar.gz
-79f81ecfa861f4d97a3b9235e66ba594 cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
+27e5c82f233e2207cca1c1db9218a362 cargo-nightly-x86_64-unknown-linux-musl.tar.gz
fe8c3891c23626882b2380e32450413d fix-release-num.patch"
sha256sums="90ec0e644586959f62e6e34e649ba57db6f74aa37b89e90972f817c49b187531 cargo-0.14.0.tar.gz
-587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9 cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
+928bd9e4966f67fe020d703a549fa04fc18d98227ec2c57f479625cbb58576c2 cargo-nightly-x86_64-unknown-linux-musl.tar.gz
3fa15aa38a1d6c0a8f1b9a1361197faa6c7de79d9e38097b38017cb352098339 fix-release-num.patch"
sha512sums="dcd6857f256f1b4cd4d0dfedbb7fceedadcf3ecbe92014f58ff3e668870624d5a1cddda1c4b2653b6ec713c6aef4810760e112e589b6eba81bba9692356acb4f cargo-0.14.0.tar.gz
-17838355ff6d87165aa0f61bd01f48c58a426c069bba7c3852d016e1836666bfafe2609c323a0409fc8530ad27fb3ad5989d8cee033633e38b07fefa670597d5 cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz
+d55792c55730689b5b7a95db0d57a5c991dd2ee565685bf43e50652597c399569759363acb18d726a2ece5ba5dbdeb396158dfb1aa68a36ca4e3f9ba92e81da3 cargo-nightly-x86_64-unknown-linux-musl.tar.gz
2db1c0870d20a6cfdff863a17180d960e2891e3cfd0ff565d1d1494eaeacfb553e2d1374cdc626f4ce5bc7c2a1c11ab99ae5462d8c3b44716a0f50f7b2b355fd fix-release-num.patch"