From 23af331a4548138b7ad3e509e16ede2a4de6ee31 Mon Sep 17 00:00:00 2001 From: Maksim Bondarenkov Date: Tue, 11 Nov 2025 20:58:08 +0300 Subject: [PATCH] rust: copy std dll into /usr/bin --- rust/PKGBUILD | 7 +++++-- rust/bootstrap.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rust/PKGBUILD b/rust/PKGBUILD index 371771bf9fa..d132e493024 100644 --- a/rust/PKGBUILD +++ b/rust/PKGBUILD @@ -7,7 +7,7 @@ rust_dist_server=https://static.rust-lang.org/dist pkgname=rust pkgver=1.91.1 -pkgrel=2 +pkgrel=3 pkgdesc="Systems programming language focused on safety, speed and concurrency" arch=('x86_64') url="https://www.rust-lang.org/" @@ -38,7 +38,7 @@ source=("${rust_dist_server}/${pkgname}c-${pkgver}-src.tar.xz"{,.asc} noextract=(${pkgname}c-${pkgver}-src.tar.xz) sha256sums=('66401bb815e236cc6b2aacbbe23b61b286c1fe27a67902e7c0222cfe77b3dbab' 'SKIP' - 'f5e4a8d2bc0b1b66d945f54285cc66bf088b05c5e3dfbb12d5d1d05dbd1de203') + 'c24975dfa00b1b8e133c5940790640a5327f683ff22ad123d096a8fb37f0f397') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg @@ -98,6 +98,9 @@ package_rust() { rm components install.log manifest-* rust-installer-version uninstall.sh rm "${pkgdir}/etc/target-spec-json-schema.json" + # workaround for https://github.com/msys2/MSYS2-packages/issues/5784 + cp "${pkgdir}"/usr/lib/rustlib/x86_64-pc-cygwin/lib/std-*.dll -t "${pkgdir}/usr/bin" + install -d "${pkgdir}/usr/share/bash-completion/completions" mv "${pkgdir}/etc/bash_completion.d/cargo" \ "${pkgdir}/usr/share/bash-completion/completions/cargo" diff --git a/rust/bootstrap.toml b/rust/bootstrap.toml index a967a9735e1..bfaec4c1481 100644 --- a/rust/bootstrap.toml +++ b/rust/bootstrap.toml @@ -25,7 +25,7 @@ tools = [ "rustdoc", "rustfmt", ] -build-dir = "cygwin-build-8" +build-dir = "cygwin-build-9" # Do not generate docs for cygwin docs = false