diff --git a/extra/rust/build b/extra/rust/build index 91dfcaaa..5892e776 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -60,7 +60,7 @@ EOF # This mimics the download process of rust's 'x.py' # bootstrap library to allow for the removal of the internet # connection requirement per build. - mkdir -p "${cache_dir:=build/cache/2022-06-30}" + mkdir -p "${cache_dir:=build/cache/2022-08-11}" for tarball in *.tar.xz\?no-extract; do mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" @@ -116,8 +116,8 @@ case $libunwind_path in */*) LIBRARY_PATH="$PWD/libgcc:$LIBRARY_PATH" esac -./x.py build -j "$(grep -scF 'core id' /proc/cpuinfo)" -./x.py install +python x.py build -j "$(grep -scF 'core id' /proc/cpuinfo)" +python x.py install rm -rf \ "$1/usr/lib/rustlib/src/" \ diff --git a/extra/rust/checksums b/extra/rust/checksums index ec641810..8165eeb3 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -1,5 +1,5 @@ -8f44af6dc44cc4146634a4dd5e4cc5470b3052a2337019b870c0e025e8987e0c -1280847d3026276d0c511fb42d81bf8c39f01b87bb19bda4248386e35b86aed0 -8c8e94ed162ff957806b4beb81ad5272c39cf116f2d96f19ccc82b7e805af11a -1d8e958aa7b17433e0bdce3515cd6b1b5127220bfd654df8ec68d40be432f7b4 +e8170d318fac9d2fc17d5c3e648e7068f56e8db8d233d864aeffbef7c6542eac +6fcfa4f9a51d35bf2c5c92ac15c688baa8c98d9fded05ab6abfdae85cb5aed8c +b6566a9b1dafe03cf4a01b58b2db0e14a0044ae5773736827882bd549108277e +6f6ce044832a2433c250f4f27a61f69081e2b0f7e4e1f141492c2ce99ee8511e 2be91d7548e55476a4e62aca25dae606a06a36ef30b51af4da5bec4da400c3b0 diff --git a/extra/rust/sources b/extra/rust/sources index b3a97ac9..4c676c51 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -1,5 +1,5 @@ https://static.rust-lang.org/dist/rustc-VERSION-src.tar.xz -https://static.rust-lang.org/dist/2022-06-30/rust-std-1.62.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2022-06-30/rustc-1.62.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2022-06-30/cargo-1.62.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2022-08-11/rust-std-1.63.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2022-08-11/rustc-1.63.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2022-08-11/cargo-1.63.0-x86_64-unknown-linux-musl.tar.xz?no-extract patches/fix-curl.patch diff --git a/extra/rust/version b/extra/rust/version index 7de1a1bd..e27de5c0 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.63.0 1 +1.64.0 1