diff --git a/mingw-w64-asm-lsp/PKGBUILD b/mingw-w64-asm-lsp/PKGBUILD index 87d2bf200a..48d87f3c1f 100644 --- a/mingw-w64-asm-lsp/PKGBUILD +++ b/mingw-w64-asm-lsp/PKGBUILD @@ -4,7 +4,7 @@ _realname=asm-lsp pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=0.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Language server for NASM/GAS/GO Assembly (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') @@ -42,7 +42,7 @@ build() { cd "${_realname}-${pkgver}" export ZSTD_SYS_USE_PKG_CONFIG=1 - export RUSTFLAGS="-C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" cargo build --release --frozen --bin asm-lsp } diff --git a/mingw-w64-blake3/PKGBUILD b/mingw-w64-blake3/PKGBUILD index 7723808455..44e004503e 100644 --- a/mingw-w64-blake3/PKGBUILD +++ b/mingw-w64-blake3/PKGBUILD @@ -42,7 +42,7 @@ build() { extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" cargo build \ --release \ --frozen \ diff --git a/mingw-w64-cargo-c/PKGBUILD b/mingw-w64-cargo-c/PKGBUILD index 67806eb96a..5543cd3986 100644 --- a/mingw-w64-cargo-c/PKGBUILD +++ b/mingw-w64-cargo-c/PKGBUILD @@ -44,7 +44,7 @@ build() { cd "${_realname}-${pkgver}" _env - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" cargo build --frozen --profile release-strip } diff --git a/mingw-w64-cargo-edit/PKGBUILD b/mingw-w64-cargo-edit/PKGBUILD index 6dafdfaa4d..2c68ac14d4 100644 --- a/mingw-w64-cargo-edit/PKGBUILD +++ b/mingw-w64-cargo-edit/PKGBUILD @@ -23,7 +23,7 @@ prepare() { build() { cd "${_realname}-${pkgver}" - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" cargo build --release --frozen } diff --git a/mingw-w64-czkawka/PKGBUILD b/mingw-w64-czkawka/PKGBUILD index b4ec319156..b3cfb8c5bb 100644 --- a/mingw-w64-czkawka/PKGBUILD +++ b/mingw-w64-czkawka/PKGBUILD @@ -36,7 +36,7 @@ prepare() { build() { cd "${_realname}-${pkgver}" - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" cargo build \ --bin krokiet \ --bin czkawka_gui \ diff --git a/mingw-w64-eza/PKGBUILD b/mingw-w64-eza/PKGBUILD index e8b03a16a7..b2b2e92fdf 100644 --- a/mingw-w64-eza/PKGBUILD +++ b/mingw-w64-eza/PKGBUILD @@ -42,7 +42,7 @@ build() { cd "${_realname}" _env - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" cargo build --release --frozen } diff --git a/mingw-w64-gitoxide/PKGBUILD b/mingw-w64-gitoxide/PKGBUILD index 9b3ec7b0e9..dd13610bef 100644 --- a/mingw-w64-gitoxide/PKGBUILD +++ b/mingw-w64-gitoxide/PKGBUILD @@ -4,7 +4,7 @@ _realname=gitoxide pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.44.0 -pkgrel=1 +pkgrel=2 pkgdesc="An idiomatic, lean, fast & safe pure Rust implementation of Git (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-powersession-rs/PKGBUILD b/mingw-w64-powersession-rs/PKGBUILD index eefb6f9a31..f3785f6caf 100644 --- a/mingw-w64-powersession-rs/PKGBUILD +++ b/mingw-w64-powersession-rs/PKGBUILD @@ -2,7 +2,7 @@ _realname=powersession-rs pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=0.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="Asciinema-compatible terminal session recorder for Windows (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') @@ -11,7 +11,6 @@ msys2_references=( 'purl: pkg:cargo/PowerSession' ) license=('spdx:MIT') -depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-rust") source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") sha256sums=('e2f6a08bbed401fbc8e423cb27f768d9f763cd572ca29bb0e547f0dd6a8429ef') diff --git a/mingw-w64-rust-analyzer/PKGBUILD b/mingw-w64-rust-analyzer/PKGBUILD index f9009964dd..14758b3ff2 100644 --- a/mingw-w64-rust-analyzer/PKGBUILD +++ b/mingw-w64-rust-analyzer/PKGBUILD @@ -27,6 +27,7 @@ prepare() { build() { cd "${_realname}" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" export CFG_RELEASE="${_pkgver} (Rev${pkgrel}, Built by MSYS2 project)" cargo build --frozen --release -p rust-analyzer } diff --git a/mingw-w64-tree-sitter/PKGBUILD b/mingw-w64-tree-sitter/PKGBUILD index 7da96e4198..c79476c6e1 100644 --- a/mingw-w64-tree-sitter/PKGBUILD +++ b/mingw-w64-tree-sitter/PKGBUILD @@ -41,7 +41,7 @@ build() { extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ cmake \ diff --git a/mingw-w64-uutils-coreutils/PKGBUILD b/mingw-w64-uutils-coreutils/PKGBUILD index 83f159d82c..d8319156b3 100644 --- a/mingw-w64-uutils-coreutils/PKGBUILD +++ b/mingw-w64-uutils-coreutils/PKGBUILD @@ -29,7 +29,7 @@ build() { cd "${_realname}-${pkgver}" export RUSTONIG_DYNAMIC_LIBONIG=1 - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" make PROFILE=release } diff --git a/mingw-w64-wasmer/PKGBUILD b/mingw-w64-wasmer/PKGBUILD index 72de773edc..9ca436686d 100644 --- a/mingw-w64-wasmer/PKGBUILD +++ b/mingw-w64-wasmer/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-lib${_realname}") pkgver=6.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="The leading Wasm Runtime supporting WASIX, WASI and Emscripten (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64') diff --git a/mingw-w64-wasmtime/PKGBUILD b/mingw-w64-wasmtime/PKGBUILD index 77702bfacc..a34627325b 100644 --- a/mingw-w64-wasmtime/PKGBUILD +++ b/mingw-w64-wasmtime/PKGBUILD @@ -49,7 +49,7 @@ END build() { export ZSTD_SYS_USE_PKG_CONFIG=1 export WINAPI_NO_BUNDLED_LIBRARIES=1 - export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" + export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}" declare -a extra_config if check_option "debug" "n"; then diff --git a/mingw-w64-watchexec/PKGBUILD b/mingw-w64-watchexec/PKGBUILD index 4594fb395b..d07580a8f1 100644 --- a/mingw-w64-watchexec/PKGBUILD +++ b/mingw-w64-watchexec/PKGBUILD @@ -2,7 +2,7 @@ _realname=watchexec pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.3.2 -pkgrel=1 +pkgrel=2 msys2_repository_url="https://github.com/watchexec/watchexec/" url="https://watchexec.github.io/" pkgdesc="Executes commands in response to file modifications (mingw-w64)" @@ -13,7 +13,6 @@ msys2_references=( ) arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') -depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-rust") options=('!strip') source=("https://github.com/watchexec/watchexec/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")