mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-03 19:32:57 +02:00
rust: update to 1.17.0.
This commit is contained in:
Leah Neukirchen
Christian Neukirchen
parent
444f7ce432
commit
42812dc537
3 changed files with 29 additions and 41 deletions
|
|
@ -1,20 +0,0 @@
|
||||||
--- rustc-1.16.0-src/src/tools/rustbook/Cargo.toml.orig
|
|
||||||
+++ rustc-1.16.0-src/src/tools/rustbook/Cargo.toml
|
|
||||||
@@ -2,7 +2,6 @@
|
|
||||||
authors = ["The Rust Project Developers"]
|
|
||||||
name = "rustbook"
|
|
||||||
version = "0.0.0"
|
|
||||||
-build = false
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "rustbook"
|
|
||||||
--- rustc-1.16.0-src/src/librustc_plugin/Cargo.toml.orig
|
|
||||||
+++ rustc-1.16.0-src/src/librustc_plugin/Cargo.toml
|
|
||||||
@@ -2,7 +2,6 @@
|
|
||||||
authors = ["The Rust Project Developers"]
|
|
||||||
name = "rustc_plugin"
|
|
||||||
version = "0.0.0"
|
|
||||||
-build = false
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "rustc_plugin"
|
|
||||||
|
|
@ -22,6 +22,14 @@
|
||||||
/// Build and prepare startup objects like rsbegin.o and rsend.o
|
/// Build and prepare startup objects like rsbegin.o and rsend.o
|
||||||
--- a/src/bootstrap/sanity.rs
|
--- a/src/bootstrap/sanity.rs
|
||||||
+++ b/src/bootstrap/sanity.rs
|
+++ b/src/bootstrap/sanity.rs
|
||||||
|
@@ -21,7 +21,6 @@
|
||||||
|
use std::collections::HashSet;
|
||||||
|
use std::env;
|
||||||
|
use std::ffi::{OsStr, OsString};
|
||||||
|
-use std::fs;
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
use build_helper::output;
|
||||||
@@ -132,27 +132,6 @@
|
@@ -132,27 +132,6 @@
|
||||||
panic!("the iOS target is only supported on OSX");
|
panic!("the iOS target is only supported on OSX");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'rust'
|
# Template file for 'rust'
|
||||||
pkgname=rust
|
pkgname=rust
|
||||||
version=1.16.0
|
version=1.17.0
|
||||||
revision=2
|
revision=1
|
||||||
# NB. if you push any(!) new version, don't forget to put a build
|
# NB. if you push any(!) new version, don't forget to put a build
|
||||||
# output of musl to https://repo.voidlinux.eu/distfiles/
|
# output of musl to https://repo.voidlinux.eu/distfiles/
|
||||||
wrksrc="rustc-${version}-src"
|
wrksrc="rustc-${version}-src"
|
||||||
|
|
@ -21,36 +21,37 @@ checksum=4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87
|
||||||
|
|
||||||
case "$XBPS_MACHINE" in
|
case "$XBPS_MACHINE" in
|
||||||
x86_64-musl)
|
x86_64-musl)
|
||||||
|
hostmakedepends+=" libcurl libgit2"
|
||||||
distfiles+="
|
distfiles+="
|
||||||
https://repo.voidlinux.eu/distfiles/rustc-1.15.1-x86_64-unknown-linux-musl.tar.gz
|
https://repo.voidlinux.eu/distfiles/rustc-1.16.0-x86_64-unknown-linux-musl.tar.gz
|
||||||
https://repo.voidlinux.eu/distfiles/rust-std-1.15.1-x86_64-unknown-linux-musl.tar.gz
|
https://repo.voidlinux.eu/distfiles/rust-std-1.16.0-x86_64-unknown-linux-musl.tar.gz
|
||||||
https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz"
|
https://repo.voidlinux.eu/distfiles/cargo-0.17.0-x86_64-unknown-linux-musl.tar.gz"
|
||||||
checksum+="
|
checksum+="
|
||||||
e7518b083cfa871ff84b589db754ebf9cbf727e3be37e6df4169056c9b34b45e
|
9ffc7e168bd6fcdb912535506efb15b06d85dc4bed79c11d5f2651978cf6116b
|
||||||
ac65873446807038df761ba94e00ba5aaa51efd379a69b938102773cbad7f2dc
|
8ccb1ba07a1ccd146f29eb0b3f3d6feffed55b987d524c8955f6c3f50c587ae5
|
||||||
587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9"
|
0150d5b249fa66a5d2515e6beb27aa6dfb25301bb50522fab7c2445bb7ecdd09"
|
||||||
;;
|
;;
|
||||||
x86_64)
|
x86_64)
|
||||||
# extract from src/stage0.txt
|
# extract from src/stage0.txt
|
||||||
distfiles+="
|
distfiles+="
|
||||||
https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz
|
https://static.rust-lang.org/dist/2017-03-11/rustc-1.16.0-x86_64-unknown-linux-gnu.tar.gz
|
||||||
https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-x86_64-unknown-linux-gnu.tar.gz
|
https://static.rust-lang.org/dist/2017-03-11/rust-std-1.16.0-x86_64-unknown-linux-gnu.tar.gz
|
||||||
https://static.rust-lang.org/cargo-dist/2016-11-26/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
|
https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
|
||||||
checksum+="
|
checksum+="
|
||||||
33ff44672b731fc71145974ce84194a1a9bafe6da3a74fd1e7543f12467f8894
|
b1dc3f754eeaf03891a3bd398c8c5024404c0078a334e5d8795e9dc419d147b3
|
||||||
69b251b478e284dfcaefc1153183f26f41d504ae213a81224f2101d8dbd52bb0
|
cbd43de2ab819d3332ce309046f3b5d715c1b47877a237791b99c96b1fe0d555
|
||||||
4a76ae206dba572e3de3f2fd7b906b42866ca4fd5f929a6f52d38579d2794e61"
|
d9e69d2b87dc0cf7fafe0e0eb64f82fe3414ef14fcb27f5eeff34df860e459d9"
|
||||||
;;
|
;;
|
||||||
i686)
|
i686)
|
||||||
# extract from src/stage0.txt
|
# extract from src/stage0.txt
|
||||||
distfiles+="
|
distfiles+="
|
||||||
https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-i686-unknown-linux-gnu.tar.gz
|
https://static.rust-lang.org/dist/2017-03-11/rustc-1.16.0-i686-unknown-linux-gnu.tar.gz
|
||||||
https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-i686-unknown-linux-gnu.tar.gz
|
https://static.rust-lang.org/dist/2017-03-11/rust-std-1.16.0-i686-unknown-linux-gnu.tar.gz
|
||||||
https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-i686-unknown-linux-gnu.tar.gz"
|
https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-linux-gnu.tar.gz"
|
||||||
checksum+="
|
checksum+="
|
||||||
a833304f99071600c72ecd868c1c7bd5ce49d1102332637a8eb7adb942f349ab
|
f8e0f96c17d8345be7818035e9bcae8e809a1b13635fe9a322df4a82d6dd1275
|
||||||
eff452a54b208a83b35432f226cb7de046d27b5e43edfc31d71ff340af686db0
|
5a74e3661f4b300bf73353389acab097f3e07813b0f3073007830a549656054a
|
||||||
8fb0cacdd2ab32b8dbdf74ae63914e1f97baf8bac0e8c1db1414a57677b93f88"
|
863a4f92bbeec76257403fd571a90b90bd759ec8bcaddb7517fb89d40959e9e5"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
@ -111,7 +112,6 @@ do_configure() {
|
||||||
--release-channel=stable
|
--release-channel=stable
|
||||||
--disable-rpath
|
--disable-rpath
|
||||||
--enable-ccache
|
--enable-ccache
|
||||||
--enable-rustbuild
|
|
||||||
--llvm-root=/usr
|
--llvm-root=/usr
|
||||||
"
|
"
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue