Skip to content

Commit e1c807c

Browse files
filnetjeremyd2019
andauthored
rust: update to 1.77.1 (#20397)
* rust: update to 1.77.1 * libc++: enable frame apis in libunwind. The bootstrapping hack used by the rust package on clang subsystems (namely, substituting compiler-rt and libunwind for libgcc and using the official gcc-based binaries to bootstrap) attempts to link to __register_frame_info and __deregister_frame_info on i686. Enabling this option brings them back. * rust: backport rust-lang/compiler-builtins#575 Also, fix 0011 patch to Cargo.lock (it was adding the embed-manifest dependency to the wrong crate due to fuzziness), and vendor embed-manifest. This allows CLANG32 to build with --enable-vendor, which is required to use our now-patched version of compiler-builtins. Note the 67c1c0a71a204c089ddae4aec21ec75aa778c11b commit was *not* the version merged upstream, but *is* the version that does not fail on either MINGW32 or CLANG32. * rust: enable uac patch for all clang prefixes. It turns out to be required on i686 *and* aarch64, but shouldn't hurt on x86_64 either. --------- Co-authored-by: Jeremy Drake <[email protected]>
1 parent e8701c3 commit e1c807c

File tree

5 files changed

+69
-29
lines changed

5 files changed

+69
-29
lines changed

mingw-w64-libc++/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _version=18.1.2
1212
_rc=""
1313
_tag=llvmorg-${_version}${_rc}
1414
pkgver=${_version}${_rc/-/}
15-
pkgrel=1
15+
pkgrel=2
1616
arch=(any)
1717
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
1818
url="https://libcxx.llvm.org/"
@@ -119,6 +119,7 @@ build() {
119119
-DLIBCXXABI_ENABLE_SHARED=OFF \
120120
-DLIBCXXABI_ENABLE_STATIC=ON \
121121
-DLIBCXXABI_HAS_WIN32_THREAD_API=ON \
122+
-DLIBUNWIND_ENABLE_FRAME_APIS=ON \
122123
-DLIBUNWIND_ENABLE_SHARED=ON \
123124
-DLIBUNWIND_ENABLE_STATIC=ON \
124125
"${_extra_config[@]}" \

mingw-w64-rust/0011-disable-uac-for-installer.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
diff -urN rustc-1.72.0-src/Cargo.lock.orig rustc-1.72.0-src/Cargo.lock
2-
--- rustc-1.72.0-src/Cargo.lock.orig 2023-08-21 16:57:17.000000000 +0200
3-
+++ rustc-1.72.0-src/Cargo.lock 2023-08-23 14:37:30.805984900 +0200
4-
@@ -323,6 +323,7 @@
5-
version = "0.1.0"
6-
dependencies = [
7-
"anyhow",
8-
+ "embed-manifest",
9-
"flate2",
10-
"hex",
11-
"rayon",
12-
@@ -986,6 +987,12 @@
1+
diff -urN rustc-1.77.0-src/Cargo.lock.orig rustc-1.77.0-src/Cargo.lock
2+
--- rustc-1.77.0-src/Cargo.lock.orig 2024-03-17 12:03:00.000000000 -0700
3+
+++ rustc-1.77.0-src/Cargo.lock 2024-03-25 11:14:51.855058900 -0700
4+
@@ -1211,6 +1211,12 @@
135
]
146

157
[[package]]
@@ -22,6 +14,14 @@ diff -urN rustc-1.72.0-src/Cargo.lock.orig rustc-1.72.0-src/Cargo.lock
2214
name = "ena"
2315
version = "0.14.2"
2416
source = "registry+https://github.com/rust-lang/crates.io-index"
17+
@@ -2011,6 +2017,7 @@
18+
dependencies = [
19+
"anyhow",
20+
"clap",
21+
+ "embed-manifest",
22+
"flate2",
23+
"rayon",
24+
"tar",
2525
diff -urN rustc-1.64.0-src.orig/src/tools/rust-installer/build.rs rustc-1.64.0-src/src/tools/rust-installer/build.rs
2626
--- rustc-1.64.0-src.orig/src/tools/rust-installer/build.rs 1970-01-01 01:00:00.000000000 +0100
2727
+++ rustc-1.64.0-src/src/tools/rust-installer/build.rs 2022-11-08 00:18:24.231485300 +0100
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
diff -Nur rustc-1.77.0-src/vendor.orig/embed-manifest/.cargo-checksum.json rustc-1.77.0-src/vendor/embed-manifest/.cargo-checksum.json
2+
--- rustc-1.77.0-src/vendor.orig/embed-manifest/.cargo-checksum.json 1969-12-31 16:00:00.000000000 -0800
3+
+++ rustc-1.77.0-src/vendor/embed-manifest/.cargo-checksum.json 2024-03-25 11:10:27.791701600 -0700
4+
@@ -0,0 +1 @@
5+
+{"files":{"CHANGELOG.md":"3b9d90277c0bb06de10a31110f3c7eea58802f2d090266631e32161f2d9c8562","Cargo.toml":"56b4fc99ece4667fd2eb8fe971070e2dc9774efa4221a9d63ffe98a7ee74642e","LICENSE":"d041a5a86caaf9cc7720f3637d689252083a664d9ccd946a36d1c7c708d204cb","README.md":"8cf8a7b20cfb7fa43c4ee9585bf92ea6c5a5c4ca3ef700974edb02025d5146c8","rustfmt.toml":"d364003c8da50e2707b7c01140c170098bac682b3f94ff98057f4ce74a18e62a","sample.exe.manifest":"01e80ef76de2b628d452c7e80022654b9e0c8aee72ec64ee522c7083d835f4df","src/embed/coff.rs":"0ea7bfb9f5135843221912078bfd83a4f424a13cf5a610b25c4275a400484fcc","src/embed/error.rs":"aecb4928e70b02b784557352608f6d4fb9b88b44ae3297a33969a0f2219c416c","src/embed/mod.rs":"0c2df4c80a4b9818f4de8e54074098d195eea19bcdd0858097416e67c733c4d9","src/embed/test.rs":"d527b7ce78bd9672057f2f9e2e268b48ffa40ad909fd6ffd119650d5244cf4a9","src/lib.rs":"ff1e87d48bb9549764e5322c54184934da08127f5187ede0db7f138544b00711","src/manifest/mod.rs":"432f4bbf330fe7c5d57876ba38cd789b6a1cd55f5c1cf408674ed153db8293a5","src/manifest/xml.rs":"1bce12120e17a49da43eabbd1b04f712b3f6ece7fcbca9186319e301890e20c5"},"package":"40ff574b0b0a794f8995383bb83f21f8f99214422cae791cb48d66da524b00f7"}

0 commit comments

Comments
 (0)