moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

rust: update to 1.23.0.

Browse source
This commit is contained in:
Leah Neukirchen 2018-01-08 20:25:27 +01:00
parent 34126102a5
commit f983d429e7
2 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/rust/patches/link-musl-dynamically.patch
View file

@ -138,8 +138,8 @@
/// Configure cargo to compile the standard library, adding appropriate env vars /// Configure cargo to compile the standard library, adding appropriate env vars
/// and such. /// and such.
pub fn std_cargo(build: &Build, pub fn std_cargo(build: &Build,
--- rustc-1.21.0-src/src/bootstrap/compile.rs.orig --- rustc-1.23.0-src/src/bootstrap/compile.rs.orig
+++ rustc-1.21.0-src/src/bootstrap/compile.rs +++ rustc-1.23.0-src/src/bootstrap/compile.rs
@@ -78,12 +78,6 @@ @@ -78,12 +78,6 @@
}); });
println!("Uplifting stage1 std ({} -> {})", from.host, target); println!("Uplifting stage1 std ({} -> {})", from.host, target);
@ -161,6 +161,6 @@
- let libdir = builder.sysroot_libdir(compiler, target); - let libdir = builder.sysroot_libdir(compiler, target);
- } - }
- -
let out_dir = build.cargo_out(compiler, Mode::Libstd, target); let out_dir = build.stage_out(compiler, Mode::Libstd);
build.clear_if_dirty(&out_dir, &builder.rustc(compiler)); build.clear_if_dirty(&out_dir, &builder.rustc(compiler));
let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "build"); let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "build");

39
srcpkgs/rust/template
View file

@ -1,6 +1,6 @@
# Template file for 'rust' # Template file for 'rust'
pkgname=rust pkgname=rust
version=1.22.1 version=1.23.0
revision=1 revision=1
_date=2017-10-28 _date=2017-10-28
# 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
@ -18,40 +18,40 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
homepage="http://www.rust-lang.org/" homepage="http://www.rust-lang.org/"
license="MIT, Apache-2.0" license="MIT, Apache-2.0"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
checksum=8b7a42bdd6eb205a8c533eb41b5c42389a88158d060aed1e0f461f68c1fd3fd3 checksum=7464953871dcfdfa8afcc536916a686dd156a83339d8ec4d5cb4eb2fe146cb91
case "$XBPS_MACHINE" in case "$XBPS_MACHINE" in
x86_64-musl) x86_64-musl)
hostmakedepends+=" libcurl libgit2" hostmakedepends+=" libcurl libgit2"
distfiles+=" distfiles+="
https://repo.voidlinux.eu/distfiles/rustc-1.21.0-x86_64-unknown-linux-musl.tar.gz https://repo.voidlinux.eu/distfiles/rustc-1.22.1-x86_64-unknown-linux-musl.tar.gz
https://repo.voidlinux.eu/distfiles/rust-std-1.21.0-x86_64-unknown-linux-musl.tar.gz https://repo.voidlinux.eu/distfiles/rust-std-1.22.1-x86_64-unknown-linux-musl.tar.gz
https://repo.voidlinux.eu/distfiles/cargo-0.18.0-x86_64-unknown-linux-musl.tar.gz" https://repo.voidlinux.eu/distfiles/cargo-0.24.0-x86_64-unknown-linux-musl.tar.gz"
checksum+=" checksum+="
b9dc8de877a5b90c798b7b8e4ff79cecf775f0edbddfe9e5b797e05fe478b533 2a2a807a11bc41dd52649edcd2e96552694f037b478066f5b96dc02d70159f05
eab6ab127f02190253c9d9e49ae9d0548b1f72bf885488a5d2f30e72c3048c1b 0eb41deb30ce8158077adb291e49cdd3447f0949c5827858ce022462825b36fc
28f2ee839f14f8b3edf3f4e4cc8600ac99ea50905ee8fb91116bba676728c2e9" 8a784a2318eea7bfd7db7d854f51dc31a25ed866757bc948babbb8edb3ba41a0"
;; ;;
x86_64) x86_64)
# extract from src/stage0.txt # extract from src/stage0.txt
distfiles+=" distfiles+="
https://static.rust-lang.org/dist/2017-10-12/rustc-1.21.0-x86_64-unknown-linux-gnu.tar.gz https://dev-static.rust-lang.org/dist/2017-11-20/rustc-1.22.0-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-10-12/rust-std-1.21.0-x86_64-unknown-linux-gnu.tar.gz https://dev-static.rust-lang.org/dist/2017-11-20/rust-std-1.22.0-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/${_date}/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz" https://static.rust-lang.org/dist/${_date}/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz"
checksum+=" checksum+="
47dad29c64cd60fb2e3e5a723c191c99dae883bf8e723dd0e6631427f148b87f a54835b06f960cb04507136a6491e561271374701bc38a8e8fd085f9e78e12e6
4c431863a6a03b24b69c539de92fbdaec916e2b70df89cb788ac1e09b2e0b70a c065c4958444955968aae60a3724bea177ddabf364c5b8cf29a08dd5d1e7df6f
28e5aae4c7f928ab41a438bcf75842480da4103c8c1eb686a07460d6b2fb74d9" 28e5aae4c7f928ab41a438bcf75842480da4103c8c1eb686a07460d6b2fb74d9"
;; ;;
i686) i686)
# extract from src/stage0.txt # extract from src/stage0.txt
distfiles+=" distfiles+="
https://static.rust-lang.org/dist/2017-10-12/rustc-1.21.0-i686-unknown-linux-gnu.tar.gz https://dev-static.rust-lang.org/dist/2017-11-20/rustc-1.22.0-i686-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/2017-10-12/rust-std-1.21.0-i686-unknown-linux-gnu.tar.gz https://dev-static.rust-lang.org/dist/2017-11-20/rust-std-1.22.0-i686-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/${_date}/cargo-nightly-i686-unknown-linux-gnu.tar.xz" https://dev-static.rust-lang.org/dist/${_date}/cargo-nightly-i686-unknown-linux-gnu.tar.xz"
checksum+=" checksum+="
706744c8f8373b4214650e790229e5bd410f8e1107680865ef25e29f1c7e5466 fb5d94ccdfa5d60ca35b7aa8b2f60b82a2e1c67ae41acc3744549eaebd1f1ddf
372aa5a123216dcca204caa9bd909c2db711554ac37f9a8d7222c190767223e3 5ec4414598cfbba4114a343911042c8f01b6284cab386e52bd37c0adea56582b
a3876e72e8424508d764375928bad386c06959d3b8fc9249fb90b578adc15d80" a3876e72e8424508d764375928bad386c06959d3b8fc9249fb90b578adc15d80"
;; ;;
esac esac
@ -62,7 +62,10 @@ post_extract() {
mkdir -p stage0 mkdir -p stage0
cp -flr ../rustc-*/rustc/* stage0 cp -flr ../rustc-*/rustc/* stage0
cp -flr ../rust-std-*/rust-std-*/* stage0 cp -flr ../rust-std-*/rust-std-*/* stage0
cp -flr ../cargo-*/cargo/* stage0 case "$XBPS_MACHINE" in
*-musl) cp -flr ../cargo stage0/bin;;
*) cp -flr ../cargo-*/cargo/* stage0;;
esac
# XXX: Cheat Rust build system so we can build rustc using different # XXX: Cheat Rust build system so we can build rustc using different
# version of (prebuilt) stable rustc than preconfigured. It's hack-ish, # version of (prebuilt) stable rustc than preconfigured. It's hack-ish,