-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
5645083
commit c1ba460
Showing
2 changed files
with
33 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- rustc-1.83.0-src/Cargo.lock | ||
+++ rustc-1.83.0-src/Cargo.lock | ||
@@ -2842,9 +2842,9 @@ | ||
|
||
[[package]] | ||
name = "psm" | ||
-version = "0.1.23" | ||
+version = "0.1.24" | ||
source = "registry+https://github.com/rust-lang/crates.io-index" | ||
-checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" | ||
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" | ||
dependencies = [ | ||
"cc", | ||
] | ||
diff -Nur rustc-1.83.0-src/vendor.orig/psm-0.1.24/.cargo-checksum.json rustc-1.83.0-src/vendor/psm-0.1.24/.cargo-checksum.json | ||
--- rustc-1.83.0-src/vendor.orig/psm-0.1.24/.cargo-checksum.json 1969-12-31 16:00:00.000000000 -0800 | ||
+++ rustc-1.83.0-src/vendor/psm-0.1.24/.cargo-checksum.json 2024-11-28 12:28:36.691597400 -0800 | ||
@@ -0,0 +1 @@ | ||
+{"files":{"Cargo.lock":"95e1fd3017cdd638fd822db04eb307c79d83baf3d129f8381806e69d5ed689db","Cargo.toml":"10c9340de427df36ae4c8cdeeb8b8a320f710f52c5150ea2d52de6ff8e5cb5f1","LICENSE-APACHE":"965a63a81d9a2fbeb5f9096954dabb49690f9dffcdac9825f675b25c807252a2","LICENSE-MIT":"3e3714aa69bd874601741fd7d7ad5298740cece37778e279fc1ab4451c5a11af","README.mkd":"973e82d1604900e47b087c81511d021c68ca296ba9ca92a3211b048482bac502","build.rs":"312beb17f9279b0ea8302fa1974f47cc9aaaa423bf4a027e80dea94da206c11d","examples/info.rs":"8ffb89912304ecbf3d714dcc094f42e86fdd0738625b2e76be2e7d59ab0736cf","examples/on_stack_fibo.rs":"287f0a08b177a97366a5da39e24e33e1f4bbe30a1f2473956721c8a9d93926a4","examples/on_stack_fibo_alloc_each_frame.rs":"e084041bbb81d51b195a4db539a765409272916df29c83a62213a93de4b6fca3","examples/panics.rs":"6791fe0dda9456b3becf989cbc89bc45ae27302e633572a57bbf10a57b830076","examples/replace_stack_1.rs":"374a28881f5e5dbf9db9b9e34929fb7a7e6f3910d782a6718f53ac269807b990","examples/thread.rs":"3cf92882aff96151608584d63535701cc8e5ae953d7ecf706d77371180bff025","src/arch/aarch64_armasm.asm":"1c737338287f3de981fbae97f104ac5e49425ba7fbcb4f7d80120afae47a86d5","src/arch/aarch_aapcs64.s":"fa3988af9f7466e263482c3fda872c82cea9a3a935c2d5f7c6d3807db5958094","src/arch/arm_aapcs.s":"4ada635e8528279bd0326654f5203b6bdc94dd68c94fdef5de551384ba1b1747","src/arch/arm_armasm.asm":"e3b514169f19368b0b49374412de38bd9f50576e7b93b64d685a0f84fa8f4c91","src/arch/loongarch64.s":"8bcdca0741c0cfd164e4541e0eaf00c80ca156479cd8a9c617bd388797551d5e","src/arch/mips64_eabi.s":"4e6f95f89ba72fc4dd1a9a547920764f66d98251d236941cee4d227010484520","src/arch/mips_eabi.s":"8b7927fd63660eb276e2951f28df6b11920f04be4dc17a16b66ad386da12c4c3","src/arch/powerpc32.s":"0b508a65dec7254ba2e0dc65a2c9e86c21069fe62f5d7c41f5190415a4885912","src/arch/powerpc64.s":"c1602d09d12ba1df48fc96af0f827f8679fc93cee728813527fb1b817a788911","src/arch/powerpc64_aix.s":"79af120692de207ea9e78efca92127ed1b522dcac62f6d17ed48f88458203a01","src/arch/powerpc64_openpower.s":"421b11cc7381427d1e2acb4e681c9836ccfea0b79930492f0a99ec4d27495e58","src/arch/psm.h":"2cebda3740aa73b167b8ec18e3d2202ca46e400a081a46329b86051abd1a872a","src/arch/riscv.s":"81a40bd95f7e93990725c5872dbef90d4844af05b15b910dde05787bdcf8482b","src/arch/riscv64.s":"5a60ac5df014152cb7630121bf97b143075211a738717993c17a70ea9519ac49","src/arch/sparc64.s":"6250acbd938aea2e440061663a79fbb2dac0592b3a193f027b6b910e2a8e3af1","src/arch/sparc_sysv.s":"c2da7576e1fbe2234cc8a5cf937f7676e125435295f8c32089bfa0b0f27fde5e","src/arch/wasm32.o":"d7279f419cb7e169cae2af2463507652e0393b801c2f4580244de70d3def58b6","src/arch/wasm32.s":"1ebdc90de48f13e6474ee17c406578fc090ff61e57c1f560ecf6e6b75c7ef10a","src/arch/x86.s":"1919a4af1474895f904ed4281a4a8fcdd0428dab257bff4ea262db83ed63b445","src/arch/x86_64.s":"656090fce2301392350d19fb36d6bcee893d637400c7dd4ac42e154b815361b8","src/arch/x86_64_msvc.asm":"85683bc65a03371ea7d8d79dcbe487f690cc2460c359817fc63c30d575ad8957","src/arch/x86_64_windows_gnu.s":"44637034e094ec0ad76dbe1232e97271c8155eb93bcb1dd86fe825acd05978a0","src/arch/x86_msvc.asm":"1735d4b19f8e46d0699fc9538baa7ab0885d27531ef7d9960e2027ad8137769b","src/arch/x86_windows_gnu.s":"b94d907a86f230c5c8ca1c708ede173f73c5269496f3959e08e4a92155e160d7","src/arch/zseries_linux.s":"5c3379a76e31bf13abf240efda12596fabce108cf63f60f9d0495e82ab8f1717","src/lib.rs":"0a9aa69a3b47cf2f572f9fe46f247e5db011e43f8960a3e6695a324ccf32287b","tests/stack_direction.rs":"77d8f9dee196e99e70d569f59fef82bc2f88a8ec17bfe07ebe2f005fcb815c8b","tests/stack_direction_2.rs":"f9191394de5b6381af6ba8223e7717230059dc335f639238c0ddbc7eb87bfc0e"},"package":"200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"} | ||
\ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" | |
$([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-rust-wasm") | ||
"${MINGW_PACKAGE_PREFIX}-rust-src") | ||
pkgver=1.83.0 | ||
pkgrel=1 | ||
pkgrel=2 | ||
pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)" | ||
arch=('any') | ||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
|
@@ -47,22 +47,26 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" | |
"${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") | ||
"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') | ||
'23fc45f4e718770375be1c5196f035075de16d25e8f895100a3d1d2492995f86' | ||
'602481687fa580eb426c619f673128702c800e91d4f476fcbaf48b86a7a1b963') | ||
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <[email protected]> | ||
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <[email protected]> | ||
'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <[email protected]> | ||
|
@@ -97,6 +101,10 @@ prepare() { | |
# 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 | ||
|
||
# 0008-disable-self-contained-for-gnu-targets.patch allows self-contained for non-windows-gnu targets | ||
cd ${_realname}c-${pkgver}-src | ||
apply_patch_with_msg \ | ||
|
@@ -108,7 +116,8 @@ prepare() { | |
0011-disable-uac-for-installer.patch | ||
fi | ||
apply_patch_with_msg \ | ||
0012-vendor-embed-manifest.patch | ||
0012-vendor-embed-manifest.patch \ | ||
0013-update-psm.patch | ||
|
||
if [[ ${CARCH} != i686 ]]; then | ||
apply_patch_with_msg \ | ||
|