Skip to content

Commit

Permalink
rust: remove clang32 workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
mati865 committed Dec 8, 2024
1 parent dbb9c4b commit 885b170
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 69 deletions.
46 changes: 0 additions & 46 deletions mingw-w64-rust/0011-disable-uac-for-installer.patch

This file was deleted.

5 changes: 0 additions & 5 deletions mingw-w64-rust/0012-vendor-embed-manifest.patch

This file was deleted.

19 changes: 1 addition & 18 deletions mingw-w64-rust/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ fi
rust_dist_server=https://static.rust-lang.org/dist
#rust_dist_server=https://dev-static.rust-lang.org/dist/2024-11-25

embed_manifest_version=1.3.1
embed_manifest_url=https://gitlab.com/careyevans/embed-manifest/-/archive/v${embed_manifest_version}/embed-manifest-v${embed_manifest_version}.tar.gz

_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=2
pkgrel=3
pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
Expand All @@ -46,26 +43,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-zstd"
"${MINGW_PACKAGE_PREFIX}-zlib")
source=("${rust_dist_server}/${_realname}c-${pkgver}-src.tar.gz"{,.asc}
"${embed_manifest_url}"
"psm-0.1.24.tar.gz::https://crates.io/api/v1/crates/psm/0.1.24/download"
"config.toml"
"0001-rustc-llvm-fix-libs.patch"
"0004-compiler-Use-wasm-ld-for-wasm-targets.patch"
"0008-disable-self-contained-for-gnu-targets.patch"
"0011-disable-uac-for-installer.patch"
"0012-vendor-embed-manifest.patch"
"0013-update-psm.patch")
noextract=(${_realname}c-${pkgver}-src.tar.gz)
sha256sums=('722d773bd4eab2d828d7dd35b59f0b017ddf9a97ee2b46c1b7f7fac5c8841c6e'
'SKIP'
'24ef6d949c0b5b1940c1d6a7aad78d86012152fb8845a1644bc939350d7b75e2'
'200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810'
'832765ebf86dca77ea371decb9937f77dbf3a377cbb2240d9016f2a82d23b363'
'7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0'
'56882f1a0f1404c10c7726d6cc37444f2b343e72b969badfcb43760f80db0f32'
'98bc3f2bd7371a5b8d14fd7b03bf05574e206d1d9e52bcfbe66d71398504da3c'
'761d73328d9695a7a2bd2a10be8225f4a56801fee54cbb51c0841b7f16e2bde6'
'23fc45f4e718770375be1c5196f035075de16d25e8f895100a3d1d2492995f86'
'602481687fa580eb426c619f673128702c800e91d4f476fcbaf48b86a7a1b963')
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <[email protected]>
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <[email protected]>
Expand Down Expand Up @@ -98,9 +89,6 @@ prepare() {
plain "Extracting ${_realname}c-${pkgver}-src.tar.gz"
tar -xzf ${_realname}c-${pkgver}-src.tar.gz || true

# move embed-manifest crate into rust source vendor directory
mv embed-manifest-v${embed_manifest_version} ${_realname}c-${pkgver}-src/vendor/embed-manifest

# use latest version of psm to fix arm4 build
rm -r ${_realname}c-${pkgver}-src/vendor/psm-0.1.23
mv psm-0.1.24 ${_realname}c-${pkgver}-src/vendor/psm-0.1.24
Expand All @@ -111,12 +99,7 @@ prepare() {
0001-rustc-llvm-fix-libs.patch \
0008-disable-self-contained-for-gnu-targets.patch

if [[ $MINGW_PACKAGE_PREFIX == *-clang-* ]]; then
apply_patch_with_msg \
0011-disable-uac-for-installer.patch
fi
apply_patch_with_msg \
0012-vendor-embed-manifest.patch \
0013-update-psm.patch

if [[ ${CARCH} != i686 ]]; then
Expand Down

0 comments on commit 885b170

Please sign in to comment.