From 062935e79bd5db35d4157327310cd0aecf0fedd1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 30 Apr 2020 21:26:28 +0300 Subject: [PATCH] rust: Move latest to testing --- testing/rust/build | 67 +++++++++++++++++++++++++ testing/rust/checksums | 6 +++ testing/rust/depends | 7 +++ testing/rust/patches/llvm10.patch | 40 +++++++++++++++ testing/rust/patches/musl.patch | 82 +++++++++++++++++++++++++++++++ testing/rust/sources | 6 +++ testing/rust/version | 1 + 7 files changed, 209 insertions(+) create mode 100755 testing/rust/build create mode 100644 testing/rust/checksums create mode 100644 testing/rust/depends create mode 100644 testing/rust/patches/llvm10.patch create mode 100644 testing/rust/patches/musl.patch create mode 100644 testing/rust/sources create mode 100644 testing/rust/version diff --git a/testing/rust/build b/testing/rust/build new file mode 100755 index 00000000..2e7fc267 --- /dev/null +++ b/testing/rust/build @@ -0,0 +1,67 @@ +#!/bin/sh -e + +for patch in *.patch; do + patch -p1 < "$patch" +done + +# This package mimics the download process of rust's 'x.py' +# bootstrap library to allow for the removal of the internet +# connection requirement per build. +{ + mkdir -p "${cache_dir:=build/cache/2020-03-12}" + + for tarball in *.tar.xz\?no-extract; do + mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" + done +} + +# 'rust' checksums files in 'vendor/', but we patch a few. +for vendor in libc openssl-sys; do + sed -i 's/\("files":{\)[^}]*/\1/' "vendor/$vendor/.cargo-checksum.json" +done + +cat > config.toml <CreateMemSet( ++ unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile)); ++#else + return wrap(unwrap(B)->CreateMemSet( + unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile)); ++#endif + } + + extern "C" LLVMValueRef diff --git a/testing/rust/patches/musl.patch b/testing/rust/patches/musl.patch new file mode 100644 index 00000000..04c246ca --- /dev/null +++ b/testing/rust/patches/musl.patch @@ -0,0 +1,82 @@ +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index eced035..f988315 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -132,7 +132,7 @@ fn copy_third_party_objects( + // with a glibc-targeting toolchain, given we have the appropriate startup + // files. As those shipped with glibc won't work, copy the ones provided by + // musl so we have them on linux-gnu hosts. +- if target.contains("musl") { ++ if target.contains("noop") { + let srcdir = builder.musl_root(target).unwrap().join("lib"); + for &obj in &["crt1.o", "crti.o", "crtn.o"] { + copy_and_stamp(&srcdir, obj); +diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs +index 8ff7056..53c0194 100644 +--- a/src/bootstrap/sanity.rs ++++ b/src/bootstrap/sanity.rs +@@ -205,7 +205,7 @@ pub fn check(build: &mut Build) { + } + + // Make sure musl-root is valid +- if target.contains("musl") { ++ if target.contains("noop") { + // If this is a native target (host is also musl) and no musl-root is given, + // fall back to the system toolchain in /usr before giving up + if build.musl_root(*target).is_none() && build.config.build == *target { +diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs +index e294e63..17fecb3 100644 +--- a/src/librustc_target/spec/linux_musl_base.rs ++++ b/src/librustc_target/spec/linux_musl_base.rs +@@ -26,7 +26,7 @@ pub fn opts() -> TargetOptions { + base.post_link_objects_crt.push("crtn.o".to_string()); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + // These targets allow the user to choose between static and dynamic linking. + base.crt_static_respected = true; + + +diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs +index a24808b..25300a5 100644 +--- a/src/libunwind/build.rs ++++ b/src/libunwind/build.rs +@@ -10,7 +10,7 @@ fn main() { + // Build the unwinding from libunwind C/C++ source code. + llvm_libunwind::compile(); + } else if target.contains("linux") { +- if target.contains("musl") { ++ if target.contains("noop") { + // linking for musl is handled in lib.rs + llvm_libunwind::compile(); + } else if !target.contains("android") { + +diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs +index 18d41be..6fddd6d 100644 +--- a/src/libunwind/lib.rs ++++ b/src/libunwind/lib.rs +@@ -18,7 +18,7 @@ cfg_if::cfg_if! { + } + } + +-#[cfg(target_env = "musl")] ++#[cfg(target_env = "noop")] + #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))] + #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] + extern "C" {} + +diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs +index 238da24..71d4f31 100644 +--- a/vendor/libc/src/unix/mod.rs ++++ b/vendor/libc/src/unix/mod.rs +@@ -298,7 +298,7 @@ cfg_if! { + } else if #[cfg(feature = "std")] { + // cargo build, don't pull in anything extra as the libstd dep + // already pulls in all libs. +- } else if #[cfg(target_env = "musl")] { ++ } else if #[cfg(target_env = "noop")] { + #[cfg_attr(feature = "rustc-dep-of-std", + link(name = "c", kind = "static", + cfg(target_feature = "crt-static")))] + diff --git a/testing/rust/sources b/testing/rust/sources new file mode 100644 index 00000000..af674ef0 --- /dev/null +++ b/testing/rust/sources @@ -0,0 +1,6 @@ +https://static.rust-lang.org/dist/rustc-1.43.0-src.tar.xz +https://static.rust-lang.org/dist/2020-03-12/rust-std-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2020-03-12/rustc-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2020-03-12/cargo-0.43.0-x86_64-unknown-linux-musl.tar.xz?no-extract +patches/musl.patch +patches/llvm10.patch diff --git a/testing/rust/version b/testing/rust/version new file mode 100644 index 00000000..57b04881 --- /dev/null +++ b/testing/rust/version @@ -0,0 +1 @@ +1.43.0 1