rebuild some rust-based packages for crt-static changes (#24342)

- rebuild packages that depended on gcc-libs but they shouldn't (was
fixed by )
- change RUSTFLAGS assignment as follow-up to PR above
This commit is contained in:
Maksim Bondarenkov 2025-05-24 18:34:50 +03:00 committed by GitHub
parent fbc4d54a3e
commit 524d78b2ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 15 additions and 16 deletions

View File

@ -4,7 +4,7 @@ _realname=asm-lsp
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.10.0 pkgver=0.10.0
pkgrel=1 pkgrel=2
pkgdesc="Language server for NASM/GAS/GO Assembly (mingw-w64)" pkgdesc="Language server for NASM/GAS/GO Assembly (mingw-w64)"
arch=('any') arch=('any')
mingw_arch=('ucrt64' 'clang64' 'clangarm64') mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@ -42,7 +42,7 @@ build() {
cd "${_realname}-${pkgver}" cd "${_realname}-${pkgver}"
export ZSTD_SYS_USE_PKG_CONFIG=1 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 cargo build --release --frozen --bin asm-lsp
} }

View File

@ -42,7 +42,7 @@ build() {
extra_config+=("-DCMAKE_BUILD_TYPE=Debug") extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi fi
export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
cargo build \ cargo build \
--release \ --release \
--frozen \ --frozen \

View File

@ -44,7 +44,7 @@ build() {
cd "${_realname}-${pkgver}" cd "${_realname}-${pkgver}"
_env _env
export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
cargo build --frozen --profile release-strip cargo build --frozen --profile release-strip
} }

View File

@ -23,7 +23,7 @@ prepare() {
build() { build() {
cd "${_realname}-${pkgver}" cd "${_realname}-${pkgver}"
export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
cargo build --release --frozen cargo build --release --frozen
} }

View File

@ -36,7 +36,7 @@ prepare() {
build() { build() {
cd "${_realname}-${pkgver}" cd "${_realname}-${pkgver}"
export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
cargo build \ cargo build \
--bin krokiet \ --bin krokiet \
--bin czkawka_gui \ --bin czkawka_gui \

View File

@ -42,7 +42,7 @@ build() {
cd "${_realname}" cd "${_realname}"
_env _env
export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
cargo build --release --frozen cargo build --release --frozen
} }

View File

@ -4,7 +4,7 @@ _realname=gitoxide
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.44.0 pkgver=0.44.0
pkgrel=1 pkgrel=2
pkgdesc="An idiomatic, lean, fast & safe pure Rust implementation of Git (mingw-w64)" pkgdesc="An idiomatic, lean, fast & safe pure Rust implementation of Git (mingw-w64)"
arch=('any') arch=('any')
mingw_arch=('ucrt64' 'clang64' 'clangarm64') mingw_arch=('ucrt64' 'clang64' 'clangarm64')

View File

@ -2,7 +2,7 @@ _realname=powersession-rs
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.1.12 pkgver=0.1.12
pkgrel=1 pkgrel=2
pkgdesc="Asciinema-compatible terminal session recorder for Windows (mingw-w64)" pkgdesc="Asciinema-compatible terminal session recorder for Windows (mingw-w64)"
arch=('any') arch=('any')
mingw_arch=('ucrt64' 'clang64' 'clangarm64') mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@ -11,7 +11,6 @@ msys2_references=(
'purl: pkg:cargo/PowerSession' 'purl: pkg:cargo/PowerSession'
) )
license=('spdx:MIT') license=('spdx:MIT')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-rust") makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
sha256sums=('e2f6a08bbed401fbc8e423cb27f768d9f763cd572ca29bb0e547f0dd6a8429ef') sha256sums=('e2f6a08bbed401fbc8e423cb27f768d9f763cd572ca29bb0e547f0dd6a8429ef')

View File

@ -27,6 +27,7 @@ prepare() {
build() { build() {
cd "${_realname}" cd "${_realname}"
export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
export CFG_RELEASE="${_pkgver} (Rev${pkgrel}, Built by MSYS2 project)" export CFG_RELEASE="${_pkgver} (Rev${pkgrel}, Built by MSYS2 project)"
cargo build --frozen --release -p rust-analyzer cargo build --frozen --release -p rust-analyzer
} }

View File

@ -41,7 +41,7 @@ build() {
extra_config+=("-DCMAKE_BUILD_TYPE=Debug") extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi fi
export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
cmake \ cmake \

View File

@ -29,7 +29,7 @@ build() {
cd "${_realname}-${pkgver}" cd "${_realname}-${pkgver}"
export RUSTONIG_DYNAMIC_LIBONIG=1 export RUSTONIG_DYNAMIC_LIBONIG=1
export RUSTFLAGS="$RUSTFLAGS -C target-feature=-crt-static" export RUSTFLAGS="${RUSTFLAGS/+crt-static/-crt-static}"
make PROFILE=release make PROFILE=release
} }

View File

@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-lib${_realname}") "${MINGW_PACKAGE_PREFIX}-lib${_realname}")
pkgver=6.0.1 pkgver=6.0.1
pkgrel=1 pkgrel=2
pkgdesc="The leading Wasm Runtime supporting WASIX, WASI and Emscripten (mingw-w64)" pkgdesc="The leading Wasm Runtime supporting WASIX, WASI and Emscripten (mingw-w64)"
arch=('any') arch=('any')
mingw_arch=('ucrt64' 'clang64') mingw_arch=('ucrt64' 'clang64')

View File

@ -49,7 +49,7 @@ END
build() { build() {
export ZSTD_SYS_USE_PKG_CONFIG=1 export ZSTD_SYS_USE_PKG_CONFIG=1
export WINAPI_NO_BUNDLED_LIBRARIES=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 declare -a extra_config
if check_option "debug" "n"; then if check_option "debug" "n"; then

View File

@ -2,7 +2,7 @@ _realname=watchexec
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.3.2 pkgver=2.3.2
pkgrel=1 pkgrel=2
msys2_repository_url="https://github.com/watchexec/watchexec/" msys2_repository_url="https://github.com/watchexec/watchexec/"
url="https://watchexec.github.io/" url="https://watchexec.github.io/"
pkgdesc="Executes commands in response to file modifications (mingw-w64)" pkgdesc="Executes commands in response to file modifications (mingw-w64)"
@ -13,7 +13,6 @@ msys2_references=(
) )
arch=('any') arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-rust") makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
options=('!strip') options=('!strip')
source=("https://github.com/watchexec/watchexec/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") source=("https://github.com/watchexec/watchexec/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")