diff options
author | Jon Gjengset | 2016-07-16 12:48:08 -0400 |
---|---|---|
committer | Jon Gjengset | 2016-07-16 12:48:08 -0400 |
commit | 066eac9329f32bb7c0cf41fe9a4a20c38765977d (patch) | |
tree | 0f8eb639cd20af77fb2ffe2402086b45b4221657 | |
parent | 73afb2fa38e9f369169bc397b2e4aaf9b82ac8dd (diff) | |
download | aur-066eac9329f32bb7c0cf41fe9a4a20c38765977d.tar.gz |
Avoid downloading cargo ourselves
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 21 |
2 files changed, 7 insertions, 23 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Jun 22 19:52:52 UTC 2016 +# Sat Jul 16 16:47:36 UTC 2016 pkgbase = rustup-git pkgdesc = The Rust toolchain installer - pkgver = 0.2.0.r8.g48b7e53 + pkgver = 0.2.0.r88.gfe1cc85 pkgrel = 1 url = https://github.com/rust-lang-nursery/rustup.rs install = post.install @@ -11,6 +11,7 @@ pkgbase = rustup-git license = MIT license = Apache makedepends = git + makedepends = cargo provides = rust provides = cargo provides = rust-nightly @@ -26,10 +27,6 @@ pkgbase = rustup-git replaces = multirust replaces = multirust-git source = rustup-git::git+https://github.com/rust-lang-nursery/rustup.rs.git - source = https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz - source = https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz.asc - md5sums = SKIP - md5sums = dc994c38b56c97081a5006c7553a55e1 md5sums = SKIP pkgname = rustup-git @@ -1,28 +1,21 @@ # Maintainer: Jon Gjengset <jon@tsp.io> pkgname=rustup-git -pkgver=0.2.0.r8.g48b7e53 +pkgver=0.2.0.r88.gfe1cc85 pkgrel=1 pkgdesc="The Rust toolchain installer" arch=('i686' 'x86_64') url="https://github.com/rust-lang-nursery/rustup.rs" license=('MIT' 'Apache') -makedepends=('git') +makedepends=('git' 'cargo') provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly' 'rustup') conflicts=('rust' 'cargo' 'rust-nightly' 'rust-nightly-bin' 'multirust' 'multirust-git' 'rustup') replaces=('multirust' 'multirust-git') install='post.install' rust="rust-1.9.0-$CARCH-unknown-linux-gnu" -source=( - "${pkgname}::git+https://github.com/rust-lang-nursery/rustup.rs.git" - "https://static.rust-lang.org/dist/${rust}.tar.gz"{,.asc} -) -# The Rust GPG Key: https://keybase.io/rust -validpgpkeys=("108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE") -md5sums=('SKIP' - 'dc994c38b56c97081a5006c7553a55e1' - 'SKIP') +source=("${pkgname}::git+https://github.com/rust-lang-nursery/rustup.rs.git") +md5sums=('SKIP') pkgver() { cd "$srcdir/${pkgname}" @@ -30,12 +23,6 @@ pkgver() { } build() { - # set up cargo - cd "$srcdir/$rust" - msg2 "Setting up cargo" - ./install.sh --prefix="$srcdir/cargo" - export PATH="$srcdir/cargo/bin:$PATH" - msg2 "Building rustup" cd "$srcdir/$pkgname" cargo build --release --bin rustup-init |