diff --git a/extra/rust/build b/extra/rust/build index 9fa84824..c1aab511 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -66,7 +66,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/2024-10-17}" + mkdir -p "${cache_dir:=build/cache/2024-11-28}" for tarball in *.tar.xz\?no-extract; do mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" diff --git a/extra/rust/checksums b/extra/rust/checksums index fe628c9b..8e7f424f 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -1,6 +1,7 @@ -4e6212077b9a4760b75d4d87392e1d7ccc0099a47698bacbd6b5377d1d5254841b -b2f385e30700a6c30e0c598bedd1663935b4aa1436e2e322efe3cec457cfe258ff -0ad6e2174f42dde6da3117027c226447b35116b9444b424ebceb41861cd1af9a0f -1248a728a0ad46a2bf3e24a91489ec5eed0ca08f18e67a5bc3825e213fc62d63ba +405fb455de32ca2303c743d94f9939700074e757bc08e25846b3055cf23e498e7b +0421a2eb37e34e28fea9318b0771e79cd2f7c8da56272e40e41b5ee1e20b7b073a +34ef847a906f161bad351fa173d9c44f58cda6db3213717cd43b08c53b706eef9b +e532c42d7eb325d75c298596b6865636bc88ea0df21ee7d092b0e9ada65a301f74 +879b657d8928ddb722e1e5447d3d26aa5e5df8b31e55bf037348388b3005bb5e1d c03ac16dbb7aecb143e7cd701feb480862af63dbb044e0f0637eaff93758937fca fb0fef39b363d51813605394a68ba775dc6c9cc295bd9f9e718d0e13376bbdfcea diff --git a/extra/rust/patches/fix-bootstrap.patch b/extra/rust/patches/fix-bootstrap.patch new file mode 100644 index 00000000..9d945932 --- /dev/null +++ b/extra/rust/patches/fix-bootstrap.patch @@ -0,0 +1,14 @@ +diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs +index e706aba..35d69a6 100644 +--- a/src/bootstrap/src/core/config/config.rs ++++ b/src/bootstrap/src/core/config/config.rs +@@ -2786,8 +2786,7 @@ impl Config { + + // If `download-rustc` is not set, default to rebuilding. + let if_unchanged = match download_rustc { +- None => self.rust_info.is_managed_git_subrepository(), +- Some(StringOrBool::Bool(false)) => return None, ++ None | Some(StringOrBool::Bool(false)) => return None, + Some(StringOrBool::Bool(true)) => false, + Some(StringOrBool::String(s)) if s == "if-unchanged" => { + if !self.rust_info.is_managed_git_subrepository() { diff --git a/extra/rust/sources b/extra/rust/sources index 5fe11637..153db78b 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -1,6 +1,7 @@ -https://static.rust-lang.org/dist/rustc-1.83.0-src.tar.xz -https://static.rust-lang.org/dist/2024-10-17/rust-std-1.82.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2024-10-17/rustc-1.82.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2024-10-17/cargo-1.82.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/rustc-1.84.0-src.tar.xz +https://static.rust-lang.org/dist/2024-11-28/rust-std-1.83.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2024-11-28/rustc-1.83.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2024-11-28/cargo-1.83.0-x86_64-unknown-linux-musl.tar.xz?no-extract +patches/fix-bootstrap.patch patches/fix-curl.patch patches/fix-linux_musl_base.patch diff --git a/extra/rust/version b/extra/rust/version index 0cf1c7a3..314912ba 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.83.0 1 +1.84.0 1