[TEST] rust 1.93.0.beta1

Author: ognevny

mingw-w64-rust/0016-allow-shared-llvm-for-all.patch

@@ -1,11 +1,11 @@
 --- a/src/bootstrap/src/core/build_steps/llvm.rs
 +++ b/src/bootstrap/src/core/build_steps/llvm.rs
-@@ -294,7 +294,7 @@
+@@ -284,7 +284,7 @@
              LlvmBuildStatus::ShouldBuild(m) => m,
          };
 
--        if builder.llvm_link_shared() && target.is_windows() && !target.ends_with("windows-gnullvm")
-+        if builder.llvm_link_shared() && target.is_msvc()
-         {
+-        if builder.llvm_link_shared() && target.is_windows() && !target.is_windows_gnullvm() {
++        if builder.llvm_link_shared() && target.is_msvc() {
              panic!("shared linking to LLVM is not currently supported on {}", target.triple);
          }
+         

mingw-w64-rust/PKGBUILD

@@ -13,7 +13,7 @@ if [[ ${CARCH} != i686 && ${MSYSTEM} != MINGW64 ]]; then
 fi
 
 #rust_dist_server=https://static.rust-lang.org/dist
-rust_dist_server=https://dev-static.rust-lang.org/dist/2025-12-08
+rust_dist_server=https://static.rust-lang.org/dist/2025-12-09
 
 _realname=rust
 pkgbase=mingw-w64-${_realname}
@@ -22,7 +22,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          $((( _wasm )) && echo \
            "${MINGW_PACKAGE_PREFIX}-rust-wasm" \
            "${MINGW_PACKAGE_PREFIX}-rust-emscripten"))
-pkgver=1.92.0
+pkgver=1.93.0.beta1
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('any')
@@ -60,26 +60,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              $((( _pgo )) && echo \
                "${MINGW_PACKAGE_PREFIX}-compiler-rt" \
                "${MINGW_PACKAGE_PREFIX}-lld"))
-source=("${rust_dist_server}/${_realname}c-${pkgver}-src.tar.xz"{,.asc}
+source=("${rust_dist_server}/${_realname}c-beta-src.tar.xz"{,.asc}
         "bootstrap.toml"
         "bootstrap-wasm.toml"
         "0001-rustc-llvm-fix-libs.patch"
         "0004-compiler-Use-wasm-ld-for-wasm-targets.patch"
         "0008-disable-self-contained-for-gnu-targets.patch"
         "0016-allow-shared-llvm-for-all.patch"
-        # patches in case of doing PGO for LLVM with opt-dist
-        #"0015-lesser-llvm-build.patch"
-        #"https://patch-diff.githubusercontent.com/raw/rust-lang/rust/pull/143898.patch"
-)
-noextract=(${_realname}c-${pkgver}-src.tar.xz)
-sha256sums=('ebee170bfe4c4dfc59521a101de651e5534f4dae889756a5c97ca9ea40d0c307'
+        "0015-lesser-llvm-build.patch")
+noextract=(${_realname}c-beta-src.tar.xz)
+sha256sums=('af3e7fe0843ecfff1168dba08615b7e500a8f9aa82926c422d01754156ca38f6'
             'SKIP'
-            '893352a1bbd21297b7f3e2b389a4e5f6f7b182a14178a66891bd3d0e1a6cb0c8'
+            'c41a9ada8eaf107c0313b05c20633f6109d9cbe90d1ae8b68fce290608424c99'
             'd693577fabe39a3046cd44fd002adf9557de6883eaea9007eae7f8372295ea0e'
             '7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0'
             '56882f1a0f1404c10c7726d6cc37444f2b343e72b969badfcb43760f80db0f32'
             '87b68c2dfbe996d3ef439278e1ac90997fc4ea192f449e8f00262360a551386a'
-            'f891ce9c3b040a17c8764d8dcbd78d39be089bffbfb884050f2a612a923536c6')
+            'eb74e880cbbd469f231b0806875a4f91ff97bba7ae197e04bd0281dd60f63b19'
+            '271d38fe98015a23dfd5bd084e0e259799258448133ba7b5ef418e844b474f01')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <[email protected]>
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <[email protected]>
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <[email protected]>
@@ -99,10 +97,10 @@ apply_patch_with_msg() {
 COMPRESSZST+=(--long)
 
 prepare() {
-  plain "Extracting ${_realname}c-${pkgver}-src.tar.xz"
-  tar -xJf ${_realname}c-${pkgver}-src.tar.xz || true
+  plain "Extracting ${_realname}c-beta-src.tar.xz"
+  tar -xJf ${_realname}c-beta-src.tar.xz || true
 
-  cd ${_realname}c-${pkgver}-src
+  cd ${_realname}c-beta-src
   if [[ ${CARCH} == i686 ]]; then
     apply_patch_with_msg \
       0001-rustc-llvm-fix-libs.patch
@@ -112,11 +110,12 @@ prepare() {
   apply_patch_with_msg \
     0008-disable-self-contained-for-gnu-targets.patch \
     0004-compiler-Use-wasm-ld-for-wasm-targets.patch \
-    0016-allow-shared-llvm-for-all.patch
+    0016-allow-shared-llvm-for-all.patch \
+    0015-lesser-llvm-build.patch
 }
 
 build() {
-  cd "${_realname}c-${pkgver}-src"
+  cd "${_realname}c-beta-src"
 
   # We have to do the following because rust doesn't count x86_64-w64-mingw32 as a target triple
   if [[ $MINGW_PACKAGE_PREFIX == *-clang-* ]]; then
@@ -146,6 +145,9 @@ build() {
   export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
   export LIBSSH2_SYS_USE_PKG_CONFIG=1
 
+  # they're managed by config
+  unset RUSTFLAGS
+
   # substitute the values in bootstrap.toml
   export MSYS2_ENV_CONV_EXCL='INSTALL_PREFIX'
   export INSTALL_PREFIX="${MINGW_PREFIX}"
@@ -169,13 +171,15 @@ build() {
   fi
 
   if (( _pgo )); then
-    sed -i -e 's/#bootstrap-override-lld/bootstrap-override-lld/' bootstrap.toml
+    sed -i -e 's/#bootstrap-override-lld/bootstrap-override-lld/' \
+           -e 's/#download-ci-llvm/download-ci-llvm/' \
+           -e 's/llvm-config/#llvm-config/' bootstrap.toml
     # build opt-dist tool which manages PGO build
     python x.py build opt-dist --target="$OSTYPE"
     local _pgo_opts=(--target-triple="$OSTYPE"
                      --checkout-dir="$PWD"
                      --llvm-dir="${MINGW_PREFIX}"
-                     --build-llvm=false
+                     --llvm-shared=false
                      --python="${MINGW_PREFIX}/bin/python.exe"
                      --artifact-dir=opt-artifacts-${MSYSTEM}
                      --build-dir=build-${MSYSTEM})
@@ -185,12 +189,10 @@ build() {
     # run opt-dist to get rustc optimized with PGO. add linker flag for InitSecurityInterfaceA symbol
     CXXFLAGS="$CXXFLAGS -fuse-ld=lld" \
     DESTDIR="$PWD/build-$MSYSTEM/dest-rust" \
-    RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static} -C link-arg=-lsecur32" \
     build-${MSYSTEM}/${OSTYPE}/stage1-tools-bin/opt-dist local ${_pgo_opts[@]} -- \
       python x.py install
   else
     DESTDIR="$PWD/build-$MSYSTEM/dest-rust" \
-    RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static} -C link-arg=-lsecur32" \
       python x.py install --stage 2
   fi
 
@@ -219,7 +221,7 @@ build() {
 }
 
 check() {
-  cd "${_realname}c-${pkgver}-src"
+  cd "${_realname}c-beta-src"
   python x.py test --stage 2 --exclude src/test/debuginfo
 }
 
@@ -243,7 +245,7 @@ package_rust() {
   conflicts=("${MINGW_PACKAGE_PREFIX}-rust-docs")
   replaces=("${MINGW_PACKAGE_PREFIX}-rust-docs")
 
-  cd "${_realname}c-${pkgver}-src/build-${MSYSTEM}"
+  cd "${_realname}c-beta-src/build-${MSYSTEM}"
 
   cp -a dest-rust/* "${pkgdir}"
 
@@ -269,7 +271,7 @@ package_rust-wasm() {
   # strip wasm object files manually due to binutils' lack of support
   options=('!strip')
 
-  cd "${_realname}c-${pkgver}-src/build-${MSYSTEM}"
+  cd "${_realname}c-beta-src/build-${MSYSTEM}"
 
   cp -a dest-wasm/* "${pkgdir}"
 
@@ -293,7 +295,7 @@ package_rust-emscripten() {
            "${MINGW_PACKAGE_PREFIX}-zstd")
   options=('!strip')
 
-  cd "${_realname}c-${pkgver}-src/build-${MSYSTEM}"
+  cd "${_realname}c-beta-src/build-${MSYSTEM}"
 
   cp -a dest-emscripten/* "${pkgdir}"
 
@@ -313,7 +315,7 @@ package_rust-src() {
   pkgdesc='Source code for the Rust standard library (mingw-w64)'
   depends=("${MINGW_PACKAGE_PREFIX}-rust")
 
-  cd "${_realname}c-${pkgver}-src/build-${MSYSTEM}"
+  cd "${_realname}c-beta-src/build-${MSYSTEM}"
 
   cp -a dest-src/* "${pkgdir}"
   install -Dm644 ../LICENSE-{APACHE,MIT} -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-src"

mingw-w64-rust/bootstrap.toml

@@ -5,7 +5,12 @@ profile = "dist"
 change-id = 146435
 
 [llvm]
-#link-shared = true
+#download-ci-llvm = true
+
+[llvm.build-config]
+LLVM_BUILD_UTILS = "OFF"
+LLVM_ENABLE_PEDANTIC = "OFF"
+"Python3_EXECUTABLE" = "$MINGW_PREFIX/bin/python.exe"
 
 [build]
 #cargo = "$MINGW_PREFIX/bin/cargo.exe"
@@ -69,6 +74,7 @@ ar = "$MINGW_PREFIX/bin/llvm-ar.exe"
 ranlib = "$MINGW_PREFIX/bin/llvm-ranlib.exe"
 linker = "$MINGW_PREFIX/bin/clang.exe"
 llvm-config = "$MINGW_PREFIX/bin/llvm-config.exe"
+rustflags = ["-Ctarget-feature=-crt-static", "-Clink-arg=-lsecur32"]
 
 [target.wasm32-unknown-unknown]
 cc = "$MINGW_PREFIX/bin/clang.exe"