Skip to content

Commit 0f1b82d

Browse files
fossddptrcnull
authored andcommitted
main/rust: upgrade to 1.87.0
https://blog.rust-lang.org/2025/05/15/Rust-1.87.0/ * Switch to LLVM 20 rust-lang/rust#135763 * Moved `rust.description` to `build.description` rust-lang/rust#137723 * Mark extern block in unwind as unsafe rust-lang/rust@a4e7f8f
1 parent 6a12a95 commit 0f1b82d

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

main/rust/APKBUILD

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
# Contributor: omni <[email protected]>
88
# Maintainer: team/rust <[email protected]>
99
pkgname=rust
10-
pkgver=1.86.0
10+
pkgver=1.87.0
1111
_llvmver=20
12-
_bootver=1.85.0
13-
pkgrel=2
12+
_bootver=1.86.0
13+
pkgrel=0
1414
# Source tarballs for beta releases are listed here:
1515
# https://static.rust-lang.org/dist/channel-rust-beta.toml
1616
pkgdesc="Rust Programming Language toolchain"
@@ -224,6 +224,8 @@ build() {
224224
esac
225225
fi
226226

227+
export PATH="/usr/lib/llvm$_llvmver/bin:$PATH"
228+
227229
# absolutely do not set these here, rust "knows" what it's doing
228230
unset CARGO_PROFILE_RELEASE_LTO
229231
unset CARGO_PROFILE_RELEASE_OPT_LEVEL
@@ -292,15 +294,15 @@ build() {
292294
--enable-vendor \
293295
--dist-compression-formats=gz \
294296
--python="python3" \
295-
--set="change-id=136941" \
297+
--set="change-id=138986" \
298+
--set="build.description=Alpine Linux $pkgver-r$pkgrel" \
296299
--set="rust.musl-root=/usr" \
297300
--set="rust.backtrace-on-ice=true" \
298301
--set="rust.codegen-units=1" \
299302
--set="rust.codegen-units-std=1" \
300303
--set="rust.deny-warnings=false" \
301304
--set="rust.remap-debuginfo=true" \
302305
--set="rust.lld=false" \
303-
--set="rust.description=Alpine Linux $pkgver-r$pkgrel" \
304306
$lto \
305307
$local_rebuild \
306308
--set="target.$_target.llvm-config=/usr/lib/llvm$_llvmver/bin/llvm-config" \
@@ -567,11 +569,11 @@ _mv() {
567569
}
568570

569571
sha512sums="
570-
9ce195e24a03765f7163de16271e3d19d731d4b80fcc2bfd919106c9d42543eade018f712f6947ea3c6e57c6cb2e6841596aa668d608b8da15101a7da14f3097 rustc-1.86.0-src.tar.xz
572+
2ef08c9be45434401f916d54b3739f52d255f8a3a4ce05a717499250c2333eeaf601f1d18085b878c027c609f44da74d0151f5bfc2c9ae1e01166919a91a1d2b rustc-1.87.0-src.tar.xz
571573
9de9d7ad05584e3cafddedcac409a4605a1d67e82260220deb3efd965603ee3148062b081c0cd736e50d82daad3a723fb6a7493fdf4dddfe36288645425a7946 alpine-move-py-scripts-to-share.patch
572574
43fba7aa9d9491e4b46ad44061f12990ce0dc8858a330c0f35e1fd6a16c9fd09b2e51ca44ca9b60889540d7f047111129bd4ce8bcbfba068fb44fd581dee8d8b alpine-target.patch
573575
aafaf76a3969666bbc5f8423cdbb6fdd62080298a5c9dd018cb157fcfa4a0ea9e7f9cf9313a70ad3f9453990ba3cbcae7b066c851a94b5608c0f0236dbd4937a do-not-install-libunwind-source.patch
574-
463c8e9cce94bf173d2f29364fd93663daaad0ae85a5534f4c9f1557b55a08094336f9f8959b86f7a3cfc132d2136489c651a305a27c8441f7f908d5a879e7ef gcc-eh-libunwind.patch
576+
71f9af2281deb4bf869446b4639f15b51f8671896157214be2ff92b6d84885a97f76f39e90896972a27d78d1ccddf4fd825b1fed9fdfba7eba578efa5618c687 gcc-eh-libunwind.patch
575577
b283d31cc8d6559aa639d44f776e97c2a1e0f23c717b6784e549861b881555bd467fa6023180866aae81a9a58c5f83e306940ee645f3c6733a1bdef6130036c9 install-template-shebang.patch
576578
9139d55df968eac0d80b582f9809633f8ed62882b08da06da67d841b23fbd2163b9723ccee916f4543ad84fb216d2e033a448fb8802620b58e125e77f20ea7eb musl-fix-linux_musl_base.patch
577579
0eb49827ec812e6ba093aa274d7cd4e9e79fb67846d90bdaa946db8ba3fb6083785692b150e0b36d6d97ba13f3c08afa30f77035492db5891e233f5e61b44976 need-rpath.patch

main/rust/gcc-eh-libunwind.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ error: aborting due to previous error
2525
+++ b/library/unwind/src/lib.rs
2626
@@ -62,7 +62,10 @@
2727
#[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
28-
extern "C" {}
28+
unsafe extern "C" {}
2929
} else {
3030
- #[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
3131
+ // on musl gcc_eh needs pthread_once from libc
3232
+ #[link(name = "gcc_eh", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
3333
+ #[link(name = "c", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
34-
+ extern "C" {}
34+
+ unsafe extern "C" {}
3535
#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
36-
extern "C" {}
36+
unsafe extern "C" {}
3737
}

0 commit comments

Comments
 (0)