rust: fixed release number
This commit is contained in:
parent
0417474567
commit
579a2e03b1
GPG Key ID:
42F8B4E30B673606
@ -1,6 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/afAMl7W1ezQIbuV+P22xud4NM5lSE5+ZXKimmiz+FmFVVbKPkJ0sCDkVgF37wOFma6fXcFD9RMjyhUx3xb2KwQ=
|
||||
SHA256 (Pkgfile) = e9909ba48d1b995765694ff93d037b4253744fe6ee4dc7a79e32a9924615970c
|
||||
RWSE3ohX2g5d/ePkcsLxVMQTvEtuF/4TZQ7SRfCPMm07IdpNmfZJGAoJP+ZpqhdAIs7Zqgk3BSOfJOEzJc9wVyoPLnnV7uXwAA4=
|
||||
SHA256 (Pkgfile) = a756f7fb01aaf2d1d2213a3b4f42b086ef74d1505edc8db99b22807665d5e04b
|
||||
SHA256 (.footprint) = 76b27a8f6a2e8e8eedffb8a8c724b04e41b36895749280bfdd89a625468094e2
|
||||
SHA256 (rustc-1.64.0-src.tar.xz) = e8170d318fac9d2fc17d5c3e648e7068f56e8db8d233d864aeffbef7c6542eac
|
||||
SHA256 (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = 993c2c17bf76ac626bfb5b17bddce65fbdfc14f70d183f33773de0cd12df46d2
|
||||
@ -9,4 +9,3 @@ SHA256 (cargo-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = f370d12e4c11f0c835becb73
|
||||
SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 60c6dfc100d292284af2187cfefc1d0d928139ca557d27bc6bef88edefccff70
|
||||
SHA256 (0001-cargo-Change-libexec-dir.patch) = c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19
|
||||
SHA256 (0002-compiler-Change-LLVM-targets.patch) = 8dcb566da29a92ecf3eb6afe094d9c7766d08230d90fd666bfd022c018ae676a
|
||||
SHA256 (remove-include-linux-fs.h.patch) = 34ed866e313e4580130a50118a4410d36fa0159123982521b6ef049439fc32ad
|
||||
|
||||
@ -9,7 +9,7 @@ version=1.64.0
|
||||
_date=2022-08-11
|
||||
_rustc=1.63.0
|
||||
_cargo=$_rustc
|
||||
release=2
|
||||
release=1
|
||||
|
||||
source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
|
||||
https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-gnu.tar.xz
|
||||
@ -17,8 +17,7 @@ source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
|
||||
https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.xz
|
||||
0001-bootstrap-Change-libexec-dir.patch
|
||||
0001-cargo-Change-libexec-dir.patch
|
||||
0002-compiler-Change-LLVM-targets.patch
|
||||
remove-include-linux-fs.h.patch)
|
||||
0002-compiler-Change-LLVM-targets.patch)
|
||||
|
||||
unpack_source() {
|
||||
for file in ${source[@]}; do
|
||||
@ -70,8 +69,6 @@ build() {
|
||||
# Use our *-pc-linux-gnu targets, making LTO with clang simpler
|
||||
patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch
|
||||
|
||||
patch -p1 -d src/llvm-project -i $SRC/remove-include-linux-fs.h.patch
|
||||
|
||||
cat <<- EOF > $SRC/config.toml
|
||||
changelog-seen = 2
|
||||
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
From 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 Mon Sep 17 00:00:00 2001
|
||||
From: Fangrui Song <i@maskray.me>
|
||||
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;
|
||||
Loading…
x
Reference in New Issue
Block a user