Date: Thursday, November 3, 2022 @ 19:12:17
Author: heftig
Revision: 460518
1.65.0-1
Modified:
rust/trunk/0001-bootstrap-Change-libexec-dir.patch
rust/trunk/0002-compiler-Change-LLVM-targets.patch
rust/trunk/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
rust/trunk/PKGBUILD
rust/trunk/keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc
Deleted:
rust/trunk/remove-include-linux-fs.h.patch
-------------------------------------------------------+
0001-bootstrap-Change-libexec-dir.patch | 31 +++++++-
0002-compiler-Change-LLVM-targets.patch | 8 +-
0003-compiler-Use-wasm-ld-for-wasm-targets.patch | 2
PKGBUILD | 17 +---
keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc | 29 ++++---
remove-include-linux-fs.h.patch | 59 ----------------
6 files changed, 53 insertions(+), 93 deletions(-)
Modified: 0001-bootstrap-Change-libexec-dir.patch
===================================================================
--- 0001-bootstrap-Change-libexec-dir.patch 2022-11-03 19:12:03 UTC (rev
460517)
+++ 0001-bootstrap-Change-libexec-dir.patch 2022-11-03 19:12:17 UTC (rev
460518)
@@ -4,14 +4,24 @@
Subject: [PATCH] bootstrap: Change libexec dir
---
- src/bootstrap/dist.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/bootstrap/dist.rs | 4 ++--
+ src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 6291b204e485..d0a193a323a6 100644
+index 1a59b3958f10..6e650d286d8f 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
-@@ -977,7 +977,7 @@ fn run(self, builder: &Builder<'_>) ->
Option<GeneratedTarball> {
+@@ -372,7 +372,7 @@ fn prepare_image(builder: &Builder<'_>, compiler:
Compiler, image: &Path) {
+ target: compiler.host,
+ })
+ .expect("rust-analyzer-proc-macro-server always builds");
+- builder.install(&ra_proc_macro_srv, &image.join("libexec"),
0o755);
++ builder.install(&ra_proc_macro_srv, &image.join("lib"), 0o755);
+
+ let libdir_relative = builder.libdir_relative(compiler);
+
+@@ -980,7 +980,7 @@ fn run(self, builder: &Builder<'_>) ->
Option<GeneratedTarball> {
for dirent in
fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
let dirent = dirent.expect("read dir entry");
if
dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
@@ -20,3 +30,16 @@
}
}
+diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs
b/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs
+index e47f70fff39e..78c2a65aee8b 100644
+--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs
++++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs
+@@ -321,7 +321,7 @@ fn eq_ignore_build_data<'a>(
+ if let Some(sysroot) = sysroot.as_ref() {
+ tracing::debug!("Found a cargo workspace with
a sysroot...");
+ let server_path =
+-
sysroot.root().join("libexec").join(&standalone_server_name);
++
sysroot.root().join("lib").join(&standalone_server_name);
+ if std::fs::metadata(&server_path).is_ok() {
+ tracing::debug!(
+ "And the server exists at {}",
Modified: 0002-compiler-Change-LLVM-targets.patch
===================================================================
--- 0002-compiler-Change-LLVM-targets.patch 2022-11-03 19:12:03 UTC (rev
460517)
+++ 0002-compiler-Change-LLVM-targets.patch 2022-11-03 19:12:17 UTC (rev
460518)
@@ -24,10 +24,10 @@
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/compiler/rustc_session/src/config.rs
b/compiler/rustc_session/src/config.rs
-index 6a8298605a23..89272b760791 100644
+index 8bb3878fbbb4..969247f5d4fa 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
-@@ -1820,7 +1820,7 @@ pub fn parse_target_triple(
+@@ -1830,7 +1830,7 @@ pub fn parse_target_triple(
early_error(error_format, &format!("target file {path:?} does
not exist"))
})
}
@@ -50,10 +50,10 @@
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
f64:32:64-f80:32-n8:16:32-S128"
diff --git a/compiler/rustc_target/src/spec/mod.rs
b/compiler/rustc_target/src/spec/mod.rs
-index f7abeafd38f1..815586e7105d 100644
+index dc16739bd560..3d8bbc0b1ff7 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -2549,6 +2549,15 @@ pub fn from_path(path: &Path) -> Result<Self,
io::Error> {
+@@ -2726,6 +2726,15 @@ pub fn from_path(path: &Path) -> Result<Self,
io::Error> {
Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path,
triple, contents })
}
Modified: 0003-compiler-Use-wasm-ld-for-wasm-targets.patch
===================================================================
--- 0003-compiler-Use-wasm-ld-for-wasm-targets.patch 2022-11-03 19:12:03 UTC
(rev 460517)
+++ 0003-compiler-Use-wasm-ld-for-wasm-targets.patch 2022-11-03 19:12:17 UTC
(rev 460518)
@@ -9,7 +9,7 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs
b/compiler/rustc_target/src/spec/wasm_base.rs
-index 9216d3e7b65f..75d038a42a69 100644
+index 28a07701eae7..e746fed1f0fe 100644
--- a/compiler/rustc_target/src/spec/wasm_base.rs
+++ b/compiler/rustc_target/src/spec/wasm_base.rs
@@ -89,8 +89,7 @@ macro_rules! args {
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-03 19:12:03 UTC (rev 460517)
+++ PKGBUILD 2022-11-03 19:12:17 UTC (rev 460518)
@@ -7,8 +7,8 @@
pkgbase=rust
pkgname=(rust lib32-rust-libs rust-musl rust-wasm rust-src)
epoch=1
-pkgver=1.64.0
-pkgrel=2
+pkgver=1.65.0
+pkgrel=1
pkgdesc="Systems programming language focused on safety, speed and concurrency"
url=https://www.rust-lang.org/
arch=(x86_64)
@@ -24,15 +24,13 @@
0001-bootstrap-Change-libexec-dir.patch
0002-compiler-Change-LLVM-targets.patch
0003-compiler-Use-wasm-ld-for-wasm-targets.patch
- remove-include-linux-fs.h.patch
)
-sha256sums=('b3cd9f481e1a2901bf6f3808d30c69cc4ea80d93c4cc4e2ed52258b180381205'
+sha256sums=('5828bb67f677eabf8c384020582b0ce7af884e1c84389484f7f8d00dd82c0038'
'SKIP'
'c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19'
- '84ae2843d5ed83e9400e96d5f2d8cf3d1b89809bea76897c2762743460e06a87'
- '1986e62bd2826eacaadd681e294943d890d75f24fd1f54fbd4015c3c622ac097'
- '8fa64a2bdfb798184bde1c80d4775889a91d8b2ed076a6ea29ea99df9a2098cc'
- '34ed866e313e4580130a50118a4410d36fa0159123982521b6ef049439fc32ad')
+ 'c88389c7ac2ce832c39450171af8fbd9bfe26f8e683f28b776b492c972fda359'
+ '5fd1d52cb58c31fb6b0179eec41f5234523dfce799c8f895b1d2d663ca0573db'
+ '27cc0fa1ef37c1ced77f62c6b0de7590b8aa88256dced3f9b87adb7c488ffa5e')
validpgpkeys=(108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag
and Release Signing Key) <[email protected]>
474E22316ABF4785A88C6E8EA2C794A986419D8A) # Tom Stellard
<[email protected]>
@@ -50,9 +48,6 @@
# Use our wasm-ld
patch -Np1 -i ../0003-compiler-Use-wasm-ld-for-wasm-targets.patch
- # https://github.com/llvm/llvm-project/issues/56421
- patch -Np1 -d src/llvm-project < ../remove-include-linux-fs.h.patch
-
cat >config.toml <<END
changelog-seen = 2
profile = "user"
Modified: keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc
===================================================================
--- keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc 2022-11-03
19:12:03 UTC (rev 460517)
+++ keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc 2022-11-03
19:12:17 UTC (rev 460518)
@@ -11,18 +11,19 @@
3fazMriTXwL1RGAbKITSWhDe5dXy/yOInWe8emJx+35vwQYCB2L4S8wRyQyRw6x4
YoXCscW041DUMBX2CC7SjMCcmAC39UX1c3GbTpS3rkJR9cmXt50nviMnKpIwlIPd
ZYhmxKifwTJ70+c4GVK2o0MG9bTYvpYhLnYxv6iJCfgmT40E+qkDSzSoZwARAQAB
-tCJUb20gU3RlbGxhcmQgPHRzdGVsbGFyQHJlZGhhdC5jb20+iQI/BBMBAgApBQJa
-6oE9AhsDBQkB4TOABwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQoseUqYZB
-nYp8Gg//RmX6Nup/Dv05jTL7dKRBSD08MF400tRtTmRhIuAgGv27qO2hbqzprKVu
-vd20vKBB9CNZpXC2oY8k9VhGv2PZNi/X7iuULIYmzjeFMbJ5CjU6XvuUBmNasITH
-6K/0KLhGebPs5h/DNtd7lbzDm86dLcjxgl6LXUULaSyYvTAKn6YB6mAv5J3qJs2X
-lfTmenNh9p7TPFTfcMHcS70ywjqKXlDiH0q9bRKJnSX7xUFlTHjKkNnAcRjlPaGf
-wUUhIPrnpDboqfwfcmScLrHANW9nwFWSFkNAJu1HQUEuF+An/RZUHDxFbLPKKAIp
-hwZ0aORTfBVZ80AjehDMYCbmp1DJeTyLjC1/94un6mlxPIKnPPPM8rMxr83xnrvP
-+Y1+pJaDUL7ZvKnmt2LrGRa9GvsNiYKpCNCORfiwZTeSxxXb+LgaodnbCHvGBnk7
-nlbLdMY08vNlxSx8LNyG0krFxJw/rq260+73yc+qjENeG68fozTEy/4jSVrF4t3m
-8AAUu5r6i/Aomo7Q27TjU928bbCVunpvDpserfDqr3zsA96LO9k8T6THR6zC9i+R
-LiN9Vjl+Rr2YuU26DjFYkCNEA2kNflYCWPJi5I0eodTPZrIPBWJ+H0YTRX31bMH9
-X88FnWJuCwaqAMN3rWlX/lXNCouWDdCuPWseZApISAMnVDE2mM8=
-=tqFG
+tCJUb20gU3RlbGxhcmQgPHRzdGVsbGFyQHJlZGhhdC5jb20+iQJWBBMBCABAAhsD
+BwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AWIQRHTiIxar9HhaiMbo6ix5SphkGd
+igUCYJMrXwUJCWsRIgAKCRCix5SphkGdir/GD/4zT43DAD9GU6VHGFeOphisH2kN
+IORVDEn8T+7iR7XLY9nVHJDxqQPUgB/gKYibrVYE0KVqjSSj3dr1cTorubMsDYgy
+gjjJSroOZupYC1+Yd8wb0jfdB6Z+CNKh0QN64BDS6D7P1GAcaIbxTyITjoz6jhyF
+Lkj4QCLiGWsMbapQA7MB4ij8t/AKORp1kW+tMyn6wfjfmYjrYOyE65UxmJtrV9Fv
+YllBt9oCAP0V9qphT6C6wxarJOuhIq9BoZOYKaUa5qRJfzNZagPG8ZalraP/MFfM
+g20hLuX5jN1jdzlHEgNt5WCYuI+uekOIUuT1PiFrmWwYXKWMAxnsVefpv8kmW8LR
+2TCG+ALvnYCRwr0Ykqh4KZcn4mpsV+QnwNAyVR6Bl6QTsPGtoHkU9Pg640mzkvgg
+w55X5kC3x4IxLskD1PFdFpW9LSRL5zz6jT5gL9Eb+zAuKpg/8w64MLnXaX69cR/p
+1rrNqZUfBOqf8fbrzy296ZSfeK4tV414iT8j76swQMAONGXoNKxO7E1cAgtxPUWW
+u3R4de3sZHGXTiEv70UNRv1TWjlVMK3Av7yDIGUnt+2wi3jilYjLWnAIgSQ46CDQ
+tUCdhdwmFcJLa3IJrs/UvHtlq6nU1sIo4wqJwfNBMHx0JZc+bKf41OgYL9ve11F5
+IKZNcvom0Pf7MkUKRQ==
+=Kuwb
-----END PGP PUBLIC KEY BLOCK-----
Deleted: remove-include-linux-fs.h.patch
===================================================================
--- remove-include-linux-fs.h.patch 2022-11-03 19:12:03 UTC (rev 460517)
+++ remove-include-linux-fs.h.patch 2022-11-03 19:12:17 UTC (rev 460518)
@@ -1,59 +0,0 @@
-From 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 Mon Sep 17 00:00:00 2001
-From: Fangrui Song <[email protected]>
-Date: Mon, 11 Jul 2022 12:53:34 -0700
-Subject: [PATCH] [sanitizer] Remove #include <linux/fs.h> to resolve
- fsconfig_command/mount_attr conflict with glibc 2.36
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It is generally not a good idea to mix usage of glibc headers and Linux UAPI
-headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc
-since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h
-defines `fsconfig_command` which conflicts with linux/mount.h:
-
- .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum
fsconfig_command’
-
-Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros
manually.
-Android sys/mount.h doesn't define BLKBSZGET and it still needs linux/fs.h.
-In the long term we should move Linux specific definitions to
sanitizer_platform_limits_linux.cpp
-but this commit is easy to cherry pick into older compiler-rt releases.
-
-Fix https://github.com/llvm/llvm-project/issues/56421
-
-Reviewed By: #sanitizers, vitalybuka, zatrazz
-
-Differential Revision: https://reviews.llvm.org/D129471
----
- .../sanitizer_platform_limits_posix.cpp | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git
a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-index 4bd425435d56..3a94b260686f 100644
---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-@@ -73,7 +73,9 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#if SANITIZER_ANDROID
- #include <linux/fs.h>
-+#endif
- #include <linux/hdreg.h>
- #include <linux/input.h>
- #include <linux/ioctl.h>
-@@ -876,10 +878,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
- unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
- #endif
-- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
-- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
-- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
-- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
-+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
-+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
-+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
-+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
- unsigned IOCTL_GIO_CMAP = GIO_CMAP;
- unsigned IOCTL_GIO_FONT = GIO_FONT;
- unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
