From 0f087cb7ddf5dc453108307a028dd53899243dd2 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Fri, 17 Apr 2020 01:56:43 +0300 Subject: rust: drop from repository --- extra/rust/build | 63 --------------------------------- extra/rust/checksums | 5 --- extra/rust/depends | 7 ---- extra/rust/patches/musl.patch | 82 ------------------------------------------- extra/rust/sources | 5 --- extra/rust/version | 1 - 6 files changed, 163 deletions(-) delete mode 100755 extra/rust/build delete mode 100644 extra/rust/checksums delete mode 100644 extra/rust/depends delete mode 100644 extra/rust/patches/musl.patch delete mode 100644 extra/rust/sources delete mode 100644 extra/rust/version diff --git a/extra/rust/build b/extra/rust/build deleted file mode 100755 index fa5c547c..00000000 --- a/extra/rust/build +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -e - -patch -p1 < musl.patch - -# 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-02-27}" - - 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 < 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/extra/rust/sources b/extra/rust/sources deleted file mode 100644 index f1a68ebc..00000000 --- a/extra/rust/sources +++ /dev/null @@ -1,5 +0,0 @@ -https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.xz -https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract -patches/musl.patch diff --git a/extra/rust/version b/extra/rust/version deleted file mode 100644 index 4c2e665d..00000000 --- a/extra/rust/version +++ /dev/null @@ -1 +0,0 @@ -1.42.0 1 -- cgit v1.2.3