From f3759c1f46b3ba58c2371a6ef7d05de60c21107f Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 15 Sep 2022 13:45:10 +0200 Subject: added rust162 to build-support --- .../0001-bootstrap-Change-libexec-dir.patch | 22 ++ .../rust162/0001-cargo-Change-libexec-dir.patch | 22 ++ .../0002-compiler-Change-LLVM-targets.patch | 84 ++++++ ...003-compiler-Use-wasm-ld-for-wasm-targets.patch | 24 ++ build-support/rust162/PKGBUILD | 303 +++++++++++++++++++++ build-support/rust162/config.toml.patch | 39 +++ .../rust162/remove-include-linux-fs.h.patch | 59 ++++ 7 files changed, 553 insertions(+) create mode 100644 build-support/rust162/0001-bootstrap-Change-libexec-dir.patch create mode 100644 build-support/rust162/0001-cargo-Change-libexec-dir.patch create mode 100644 build-support/rust162/0002-compiler-Change-LLVM-targets.patch create mode 100644 build-support/rust162/0003-compiler-Use-wasm-ld-for-wasm-targets.patch create mode 100644 build-support/rust162/PKGBUILD create mode 100644 build-support/rust162/config.toml.patch create mode 100644 build-support/rust162/remove-include-linux-fs.h.patch diff --git a/build-support/rust162/0001-bootstrap-Change-libexec-dir.patch b/build-support/rust162/0001-bootstrap-Change-libexec-dir.patch new file mode 100644 index 00000000..903a38dc --- /dev/null +++ b/build-support/rust162/0001-bootstrap-Change-libexec-dir.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Thu, 6 May 2021 20:14:58 +0200 +Subject: [PATCH] bootstrap: Change libexec dir + +--- + src/bootstrap/dist.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index b1fae356d893..a9783708d7a7 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -950,7 +950,7 @@ fn run(self, builder: &Builder<'_>) -> Option { + 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-") { +- tarball.add_file(&dirent.path(), "libexec", 0o755); ++ tarball.add_file(&dirent.path(), "lib", 0o755); + } + } + diff --git a/build-support/rust162/0001-cargo-Change-libexec-dir.patch b/build-support/rust162/0001-cargo-Change-libexec-dir.patch new file mode 100644 index 00000000..06bc493d --- /dev/null +++ b/build-support/rust162/0001-cargo-Change-libexec-dir.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Thu, 6 May 2021 20:13:31 +0200 +Subject: [PATCH] cargo: Change libexec dir + +--- + src/cargo/ops/registry/auth.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cargo/ops/registry/auth.rs b/src/cargo/ops/registry/auth.rs +index 648e051e6dc2..a7b24e07e552 100644 +--- a/src/cargo/ops/registry/auth.rs ++++ b/src/cargo/ops/registry/auth.rs +@@ -224,7 +224,7 @@ fn sysroot_credential( + .parent() + .and_then(|p| p.parent()) + .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?; +- let exe = root.join("libexec").join(format!( ++ let exe = root.join("lib").join(format!( + "cargo-credential-{}{}", + cred_name, + std::env::consts::EXE_SUFFIX diff --git a/build-support/rust162/0002-compiler-Change-LLVM-targets.patch b/build-support/rust162/0002-compiler-Change-LLVM-targets.patch new file mode 100644 index 00000000..a6e58b9c --- /dev/null +++ b/build-support/rust162/0002-compiler-Change-LLVM-targets.patch @@ -0,0 +1,84 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Fri, 12 Mar 2021 17:31:56 +0100 +Subject: [PATCH] compiler: Change LLVM targets + + - Change x86_64-unknown-linux-gnu to use x86_64-pc-linux-gnu + - Change i686-unknown-linux-gnu to use i686-pc-linux-gnu + +Reintroduce the aliasing that was removed in 1.52.0 and alias the -pc- +triples to the -unknown- triples. This avoids defining proper -pc- +targets, as things break when this is done: + + - The crate ecosystem expects the -unknown- targets. Making -pc- + rustc's host triple (and thus default target) would break various + crates. + - Firefox's build breaks when the host triple (from + `rustc --version --verbose`) is different from the target triple + (from `rustc --print target-list`) that best matches autoconf. +--- + compiler/rustc_session/src/config.rs | 2 +- + compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +- + compiler/rustc_target/src/spec/mod.rs | 9 +++++++++ + .../rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +- + 4 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs +index 14ad1a42a7d8..efd47c47293b 100644 +--- a/compiler/rustc_session/src/config.rs ++++ b/compiler/rustc_session/src/config.rs +@@ -1867,7 +1867,7 @@ pub fn parse_target_triple( + early_error(error_format, &format!("target file {path:?} does not exist")) + }) + } +- Some(target) => TargetTriple::TargetTriple(target), ++ Some(target) => TargetTriple::from_alias(target), + _ => TargetTriple::from_triple(host_triple()), + } + } +diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs +index 0998c618f31a..91c79c7e4ff0 100644 +--- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs +@@ -9,7 +9,7 @@ pub fn target() -> Target { + base.stack_probes = StackProbeType::Call; + + Target { +- llvm_target: "i686-unknown-linux-gnu".into(), ++ llvm_target: "i686-pc-linux-gnu".into(), + pointer_width: 32, + 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 da0589cdd209..dc9865bdf64a 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -2506,6 +2506,15 @@ pub fn from_path(path: &Path) -> Result { + Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents }) + } + ++ /// Creates a target triple from its alias ++ pub fn from_alias(triple: String) -> Self { ++ match triple.as_str() { ++ "x86_64-pc-linux-gnu" => TargetTriple::from_triple("x86_64-unknown-linux-gnu"), ++ "i686-pc-linux-gnu" => TargetTriple::from_triple("i686-unknown-linux-gnu"), ++ _ => TargetTriple::TargetTriple(triple), ++ } ++ } ++ + /// Returns a string triple for this target. + /// + /// If this target is a path, the file name (without extension) is returned. +diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +index e525cfdde14f..2dfe25f4f238 100644 +--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +@@ -15,7 +15,7 @@ pub fn target() -> Target { + | SanitizerSet::THREAD; + + Target { +- llvm_target: "x86_64-unknown-linux-gnu".into(), ++ llvm_target: "x86_64-pc-linux-gnu".into(), + pointer_width: 64, + data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" + .into(), diff --git a/build-support/rust162/0003-compiler-Use-wasm-ld-for-wasm-targets.patch b/build-support/rust162/0003-compiler-Use-wasm-ld-for-wasm-targets.patch new file mode 100644 index 00000000..c2002ae6 --- /dev/null +++ b/build-support/rust162/0003-compiler-Use-wasm-ld-for-wasm-targets.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 6 Nov 2021 22:42:06 +0100 +Subject: [PATCH] compiler: Use wasm-ld for wasm targets + +We don't ship rust-lld. +--- + compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- + 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 de7b7374af31..9ea181ab8d8f 100644 +--- a/compiler/rustc_target/src/spec/wasm_base.rs ++++ b/compiler/rustc_target/src/spec/wasm_base.rs +@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions { + // arguments just yet + limit_rdylib_exports: false, + +- // we use the LLD shipped with the Rust toolchain by default +- linker: Some("rust-lld".into()), ++ linker: Some("wasm-ld".into()), + lld_flavor: LldFlavor::Wasm, + linker_is_gnu: false, + diff --git a/build-support/rust162/PKGBUILD b/build-support/rust162/PKGBUILD new file mode 100644 index 00000000..33a068d3 --- /dev/null +++ b/build-support/rust162/PKGBUILD @@ -0,0 +1,303 @@ +# Maintainer: Johannes Löthberg +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Alexander F Rødseth +# Contributor: Daniel Micay +# Contributor: userwithuid + +pkgbase=rust162 +pkgname=(rust162 rust162-musl rust162-wasm rust162-src) +epoch=1 +pkgver=1.62.0 +pkgrel=1 +pkgdesc="Systems programming language focused on safety, speed and concurrency" +url=https://www.rust-lang.org/ +arch=(i486 i686 pentium4 x86_64) +license=(MIT Apache) +options=(!emptydirs !strip !lto) +depends=(gcc-libs llvm-libs curl libssh2 gcc) +makedepends=(rust llvm libffi lib32-gcc-libs perl python cmake musl ninja + wasi-libc lld) +checkdepends=(procps-ng gdb) +source=( + "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} + 0001-cargo-Change-libexec-dir.patch + 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=('7d0878809b64d206825acae3eb7f60afb2212d81e3de1adf4c11c6032b36c027' + 'SKIP' + 'c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19' + '7080a88e44234aa363ba6321f319c8d9621382dd9581748a43847dae005e55bd' + '5137df0a3399e279db4c5b83ae8e99d2c1977f62aec2f90521edb02f51597064' + '26bf232d144b81a303ed91f6a331ddf004c5d9fefd41a11e36b61812a34459aa' + '34ed866e313e4580130a50118a4410d36fa0159123982521b6ef049439fc32ad') +validpgpkeys=(108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) + 474E22316ABF4785A88C6E8EA2C794A986419D8A) # Tom Stellard + +prepare() { + cd rustc-$pkgver-src + + # Patch bootstrap and cargo so credential helpers + # are in /usr/lib instead of /usr/libexec + patch -d src/tools/cargo -Np1 < ../0001-cargo-Change-libexec-dir.patch + patch -Np1 -i ../0001-bootstrap-Change-libexec-dir.patch + + # Use our *-pc-linux-gnu targets, making LTO with clang simpler + patch -Np1 -i ../0002-compiler-Change-LLVM-targets.patch + + # 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 < +Date: Mon, 11 Jul 2022 12:53:34 -0700 +Subject: [PATCH] [sanitizer] Remove #include 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 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 + #include + #include ++#if SANITIZER_ANDROID + #include ++#endif + #include + #include + #include +@@ -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; -- cgit v1.2.3-70-g09d2