rust: update to 1.84.0

msys2 · Jan 7, 2025 · 14e10bb · 14e10bb
1 parent 7727aa2
commit 14e10bb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/mingw-w64-rust/PKGBUILD b/mingw-w64-rust/PKGBUILD
@@ -8,16 +8,16 @@ if [[ $MINGW_PACKAGE_PREFIX == *-clang-* ]]; then
   _bootstrapping=no
 fi
 
-rust_dist_server=https://static.rust-lang.org/dist
-#rust_dist_server=https://dev-static.rust-lang.org/dist/2024-11-25
+#rust_dist_server=https://static.rust-lang.org/dist
+rust_dist_server=https://dev-static.rust-lang.org/dist/2025-01-07
 
 _realname=rust
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-rust-wasm")
          "${MINGW_PACKAGE_PREFIX}-rust-src")
-pkgver=1.83.0
-pkgrel=4
+pkgver=1.84.0
+pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -50,10 +50,10 @@ source=("${rust_dist_server}/${_realname}c-${pkgver}-src.tar.gz"{,.asc}
         "0008-disable-self-contained-for-gnu-targets.patch"
         "0013-update-psm.patch")
 noextract=(${_realname}c-${pkgver}-src.tar.gz)
-sha256sums=('722d773bd4eab2d828d7dd35b59f0b017ddf9a97ee2b46c1b7f7fac5c8841c6e'
+sha256sums=('15cee7395b07ffde022060455b3140366ec3a12cbbea8f1ef2ff371a9cca51bf'
             'SKIP'
             '200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810'
-            'd4253c4b72c789a3a7f276ad75673d8c67c28af76e1d7711919509c667fcfbf8'
+            '2ee9e2c89ba6eaf7415c6018fc8cf51d02098d60c3d138ac342f1416416876c9'
             '7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0'
             '56882f1a0f1404c10c7726d6cc37444f2b343e72b969badfcb43760f80db0f32'
             '98bc3f2bd7371a5b8d14fd7b03bf05574e206d1d9e52bcfbe66d71398504da3c'
@@ -168,6 +168,11 @@ build() {
     sed -i '/target = \[/a\  "wasm32-unknown-unknown", "wasm32-wasip1", "wasm32-wasip1-threads", "wasm32-wasip2",' config.toml
   fi
 
+  # Enable CFGuard for gnullvm
+  if [[ $MINGW_PACKAGE_PREFIX == *-clang-* ]]; then
+    sed -i "s/^#control-flow-guard/control-flow-guard/g" config.toml
+  fi
+
   local -a _rust_build=()
   _rust_build+=("--stage" "2")
   #_rust_build+=("--verbose")

diff --git a/mingw-w64-rust/config.toml b/mingw-w64-rust/config.toml
@@ -2,7 +2,7 @@
 profile = "dist"
 
 # see src/bootstrap/src/utils/change_tracker.rs
-change-id = 131075
+change-id = 133207
 
 [build]
 #cargo = "$MINGW_PREFIX/bin/cargo.exe"
@@ -41,7 +41,6 @@ sysconfdir = "etc"
 #debug = true
 codegen-units-std = 1
 #debuginfo-level-std = 2
-parallel-compiler = false
 channel = "stable"
 description = "Rev$PKGREL, Built by MSYS2 project"
 rpath = false
@@ -51,8 +50,9 @@ lld = false
 codegen-tests = false
 deny-warnings = false
 backtrace-on-ice = true
-# FIXME: CFG can be enabled only for MSVC targets as for https://github.com/rust-lang/rust/pull/74103
-# control-flow-guard = true
+# FIXME: CFG can be enabled only for MSVC and LLVM targets as for
+# https://github.com/rust-lang/rust/pull/74103 and https://github.com/rust-lang/rust/pull/132965
+#control-flow-guard = true
 
 [dist]
 compression-formats = ["gz"]