diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-09 20:55:07 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-12 14:20:02 +0200 |
| commit | d05b0bdd6b489ab31a22904e55447ba0e84ba4f3 (patch) | |
| tree | f6e9aac90d6bcfd5c1ab028c08b1b99b9c5fbc93 /testing | |
| parent | 9bbbb65173b57fc96c1cb9a456570c41907c2835 (diff) | |
| download | aports-d05b0bdd6b489ab31a22904e55447ba0e84ba4f3.tar.bz2 aports-d05b0bdd6b489ab31a22904e55447ba0e84ba4f3.tar.xz | |
testing/cargo: upgrade to 0.17.0
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/cargo/APKBUILD | 33 | ||||
| -rw-r--r-- | testing/cargo/fix-release-num.patch | 22 |
2 files changed, 24 insertions, 31 deletions
diff --git a/testing/cargo/APKBUILD b/testing/cargo/APKBUILD index e7047ff384..b8b980953d 100644 --- a/testing/cargo/APKBUILD +++ b/testing/cargo/APKBUILD @@ -1,9 +1,11 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=cargo -pkgver=0.14.0 +pkgver=0.17.0 # Git revision of prebuilt Cargo to use for bootstrapping. -_bootstrap_gitrev=333a79884d2463b11f279d815284b6406656c949 +_bootstrap_gitrev=6e0c18cccc8b0c06fba8a8d76486f81a792fb420 # 0.16.0 +# Git revision of rust-installer (submodule in cargo repo). +_installer_gitrev=4f994850808a572e2cc8d43f968893c8e942e9bf pkgrel=0 pkgdesc="The Rust package manager" url="https://crates.io" @@ -18,28 +20,41 @@ subpackages="$pkgname-doc # TODO: Implement some support for verifying crates fetched by cargo! _ctarget="$CARCH-unknown-linux-musl" source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/$pkgname/archive/$pkgver.tar.gz - cargo-$_bootstrap_gitrev-$_ctarget.tar.gz::https://s3.amazonaws.com/rust-lang-ci/cargo-builds/$_bootstrap_gitrev/cargo-nightly-$_ctarget.tar.gz - fix-release-num.patch" + https://github.com/rust-lang/rust-installer/archive/$_installer_gitrev/rust-installer-$_installer_gitrev.tar.gz + cargo-$_bootstrap_gitrev-$_ctarget.tar.gz::https://s3.amazonaws.com/rust-lang-ci/cargo-builds/$_bootstrap_gitrev/cargo-nightly-$_ctarget.tar.gz" builddir="$srcdir/$pkgname-$pkgver" +prepare() { + default_prepare + cd "$builddir" + + rmdir src/rust-installer + ln -s "$srcdir"/rust-installer-$_installer_gitrev src/rust-installer +} + build() { cd "$builddir" ./configure \ --prefix=/usr \ - --local-cargo="$srcdir/cargo-nightly-$_ctarget/cargo/bin/cargo" + --release-channel=stable \ + --cargo="$srcdir/cargo-nightly-$_ctarget/cargo/bin/cargo" # LIBGIT2... Convince libgit2-sys to use the distro libgit2. make CARGOFLAGS="--locked" \ CARGO_HOME="$srcdir/.cargo" \ LIBGIT2_SYS_USE_PKG_CONFIG=1 \ + RUSTFLAGS="-C target-feature=-crt-static" \ VERBOSE=1 } package() { cd "$builddir" - make prepare-image-$_ctarget IMGDIR_$_ctarget="$pkgdir/usr" + make install DESTDIR="$pkgdir" + + # Remove installer artifacts (manifests, uninstall scripts, etc.) + rm -rv "$pkgdir"/usr/lib } bashcomp() { @@ -69,6 +84,6 @@ _mv() { mv $@ } -sha512sums="dcd6857f256f1b4cd4d0dfedbb7fceedadcf3ecbe92014f58ff3e668870624d5a1cddda1c4b2653b6ec713c6aef4810760e112e589b6eba81bba9692356acb4f cargo-0.14.0.tar.gz -d55792c55730689b5b7a95db0d57a5c991dd2ee565685bf43e50652597c399569759363acb18d726a2ece5ba5dbdeb396158dfb1aa68a36ca4e3f9ba92e81da3 cargo-333a79884d2463b11f279d815284b6406656c949-x86_64-unknown-linux-musl.tar.gz -2db1c0870d20a6cfdff863a17180d960e2891e3cfd0ff565d1d1494eaeacfb553e2d1374cdc626f4ce5bc7c2a1c11ab99ae5462d8c3b44716a0f50f7b2b355fd fix-release-num.patch" +sha512sums="5ea9a382ab48ee714b5cd1412f11ae72c6065913e2ce56cf84fe43f9061fd383f32c16a6525e5400f3fec9c10eaa3e7a149b026ae9c64af0955e91678b032650 cargo-0.17.0.tar.gz +9ceb4755890ad3ae68ce141231c5114077261e0279d3a9a6208053f8d3386c9198e6b94d6321b456648dd5baa86dfc3ae81df44b67d41b428d11afd6763f0cff rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz +4df33353b6be1af822220ca03f9ec5a3b6421c9b10ec17b864be586ba495c6210bac70d904b0e0b35eff62ef2c9a681ded526e5cbd37e326dc3146742aa659de cargo-6e0c18cccc8b0c06fba8a8d76486f81a792fb420-x86_64-unknown-linux-musl.tar.gz" diff --git a/testing/cargo/fix-release-num.patch b/testing/cargo/fix-release-num.patch deleted file mode 100644 index 9c23495410..0000000000 --- a/testing/cargo/fix-release-num.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e035d532bf93b597216fcd11c99f2b8b6ba6eac1 Mon Sep 17 00:00:00 2001 -From: Alex Crichton <alex@alexcrichton.com> -Date: Fri, 4 Nov 2016 15:44:46 -0700 -Subject: [PATCH] Update makefile to 0.14.0 - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 98d5e91c8053..08dc61626ee1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,4 +1,4 @@ --CFG_RELEASE_NUM=0.13.0 -+CFG_RELEASE_NUM=0.14.0 - CFG_RELEASE_LABEL= - - OPENSSL_VERS=1.0.2j --- -1.8.3.1 - |