rustup: update to 1.16.0.

also symlink rustup into $CARGO_HOME/bin/rustup instead of copying
it. Otherwise we can't update it via xbps

fixes #5398
This commit is contained in:
Rasmus Thomsen 2018-12-13 20:48:18 +01:00 committed by maxice8
parent eaf2a13c32
commit cdb5ac2b9a
4 changed files with 18 additions and 7 deletions

View file

@ -0,0 +1 @@
Please run rustup-init after initial install to use rustup.

View file

@ -1,2 +0,0 @@
# Export PATH ourselves so we don't need to run rustup-init
export PATH="$PATH:$HOME/.cargo/bin"

View file

@ -0,0 +1,14 @@
Upstream: No, not upstreamable like this
Reason: We want the rustup binary in $CARGO_HOME/bin to be of the
same version as the one we distribute in this rustup package.
--- src/rustup-cli/self_update.rs.1 2018-12-13 21:56:55.211778812 +0100
+++ src/rustup-cli/self_update.rs 2018-12-13 21:56:42.763779768 +0100
@@ -671,8 +671,7 @@
if rustup_path.exists() {
utils::remove_file("rustup-bin", rustup_path)?;
}
- utils::copy_file(this_exe_path, rustup_path)?;
- utils::make_executable(rustup_path)?;
+ utils::symlink_file(this_exe_path, rustup_path)?;
install_proxies()
}

View file

@ -1,6 +1,6 @@
# Template file for 'rustup'
pkgname=rustup
version=1.15.0
version=1.16.0
revision=1
wrksrc="${pkgname}.rs-${version}"
build_style=cargo
@ -12,10 +12,10 @@ maintainer="Daniel Lee Ramírez <dleeram@protonmail.com>"
license="Apache-2.0, MIT"
homepage="https://www.rustup.rs"
distfiles="https://github.com/rust-lang-nursery/${pkgname}.rs/archive/${version}.tar.gz"
checksum=470441d59dbb33f4e3e52e3f7420734dae0066598802c2b3b4f89f5b3a6a9e45
checksum=8c4ffeda2088dbdd5ea2eac8acef5ddd57dfcfe1f06a503e3da790f93161e1a6
do_install() {
vbin target/${RUST_TARGET}/release/rustup-init rustup
vbin target/${RUST_TARGET}/release/rustup-init
if ! [ "$CROSS_BUILD" ]; then
# generate shell completions
@ -29,8 +29,6 @@ do_install() {
vinstall rustup.fish 0644 usr/share/fish/completions/
fi
vinstall ${FILESDIR}/rustup.sh 0644 etc/profile.d/
vdoc README.md
vlicense LICENSE-APACHE
vlicense LICENSE-MIT