summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Gjengset2016-07-16 12:48:08 -0400
committerJon Gjengset2016-07-16 12:48:08 -0400
commit066eac9329f32bb7c0cf41fe9a4a20c38765977d (patch)
tree0f8eb639cd20af77fb2ffe2402086b45b4221657
parent73afb2fa38e9f369169bc397b2e4aaf9b82ac8dd (diff)
downloadaur-066eac9329f32bb7c0cf41fe9a4a20c38765977d.tar.gz
Avoid downloading cargo ourselves
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD21
2 files changed, 7 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 040e6c3fbf9..f59fdf5291b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 7a5dd749c46..37c7a3e072c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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