rust: 1.45.0

extra/rust/build

@@ -8,7 +8,7 @@ done
 # bootstrap library to allow for the removal of the internet
 # connection requirement per build.
 {
-    mkdir -p "${cache_dir:=build/cache/2020-05-07}"
+    mkdir -p "${cache_dir:=build/cache/2020-06-04}"
 
     for tarball in *.tar.xz\?no-extract; do
         mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"

extra/rust/checksums

@@ -1,6 +1,6 @@
-e0386295dd5f2c7842835a509e4c57989eec6c29f989a1c85478b0e06f9d38ea  rustc-1.44.1-src.tar.xz
+c436034db42bc0ea7e7f32816ac6555b70d1f76c834407597966dfaf2ec839d6  rustc-1.45.0-src.tar.xz
-f3b55147ff6e01448699eaf0875d7956ea38eeef42a19cda9d555e814470e823  rust-std-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+ff43c33836d5a56ce8089f8a0b101cbb12f130374e9631acdcc00f5f051f6429  rust-std-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-be982dc01b5c86a3f2b0b99a2ca0e13b3cea698ee6f1db9fa024de5c8b35a75d  rustc-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+f023a98493b3617f3eecbc0744c88a9b4d4e1a8ac105d0cf50a9c191018facf6  rustc-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-653cb60214d6f1000c9a7775111dccd093c0118e7f7bf5f2f1f53a7e5e2420b3  cargo-0.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+d5d2a23e9cf67d0564cdfcb11fbca9c68719061c4a8581aa80f0e38617a609aa  cargo-0.45.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-abb2acdfc50880da504225dd068f5ea381997cac9ebd23f371290aa8f29d438f  musl.patch
+13261c1288dd7ad3e376162041db017a0e2bcbcb77f974c0bc9bd0681361213e  musl.patch
 903880513dc61427bfedcd99c9b8a4b8156952b9cc5c486e29e5d5a2a77b484a  libressl-3.1.X.patch

extra/rust/patches/musl.patch

@@ -1,23 +1,23 @@
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index eced035..f988315 100644
+index b3999118e..f809a8e99 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
+     // to using gcc from a glibc-targeting toolchain for linking.
-     // files. As those shipped with glibc won't work, copy the ones provided by
+     // To do that we have to distribute musl startup objects as a part of Rust toolchain
-     // musl so we have them on linux-gnu hosts.
+     // and link with them manually in the self-contained mode.
 -    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"] {
+         for &obj in &["crt1.o", "Scrt1.o", "rcrt1.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
+index 74b47d077..b700f8a09 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
-@@ -205,7 +205,7 @@ pub fn check(build: &mut Build) {
+@@ -192,7 +192,7 @@ pub fn check(build: &mut Build) {
          }
-
+ 
          // Make sure musl-root is valid
 -        if target.contains("musl") {
 +        if target.contains("noop") {
@@ -25,21 +25,20 @@ index 8ff7056..53c0194 100644
              // 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
+index 0fdd87608..63f00585f 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 {
+@@ -15,7 +15,7 @@ pub fn opts() -> TargetOptions {
-     base.post_link_objects_crt.push("crtn.o".to_string());
+     base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);
-
+ 
      // 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
+index 146263925..c9aa30e2d 100644
 --- a/src/libunwind/build.rs
 +++ b/src/libunwind/build.rs
 @@ -10,7 +10,7 @@ fn main() {
@@ -51,26 +50,24 @@ index a24808b..25300a5 100644
              // 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
+index cc025da1a..0506db514 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
+index 1084d9aa9..085c7ff9e 100644
 --- a/vendor/libc/src/unix/mod.rs
 +++ b/vendor/libc/src/unix/mod.rs
-@@ -298,7 +298,7 @@ cfg_if! {
+@@ -302,7 +302,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.
@@ -79,4 +76,3 @@ index 238da24..71d4f31 100644
          #[cfg_attr(feature = "rustc-dep-of-std",
                     link(name = "c", kind = "static",
                          cfg(target_feature = "crt-static")))]
-

extra/rust/sources

@@ -1,6 +1,6 @@
-https://static.rust-lang.org/dist/rustc-1.44.1-src.tar.xz
+https://static.rust-lang.org/dist/rustc-1.45.0-src.tar.xz
-https://static.rust-lang.org/dist/2020-05-07/rust-std-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2020-06-04/rust-std-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-05-07/rustc-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2020-06-04/rustc-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-05-07/cargo-0.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2020-06-04/cargo-0.45.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 patches/musl.patch
 patches/libressl-3.1.X.patch

extra/rust/version

@@ -1 +1 @@
-1.44.1 1
+1.45.0 1

testing/rust/build

@@ -1,67 +0,0 @@
-#!/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-06-04}"
-
-    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 <<EOF
-[llvm]
-link-shared = true
-
-[build]
-build  = "x86_64-unknown-linux-musl"
-host   = [ "x86_64-unknown-linux-musl" ]
-target = [ "x86_64-unknown-linux-musl" ]
-
-docs           = false
-compiler-docs  = false
-extended       = true
-submodules     = false
-python         = "python3"
-locked-deps    = true
-vendor         = true
-sanitizers     = false
-profiler       = false
-full-bootstrap = false
-
-[install]
-prefix = "/usr"
-
-[rust]
-channel          = "stable"
-rpath            = false
-codegen-units    = 1
-debuginfo-level  = 0
-debug            = false
-backtrace        = false
-jemalloc         = false
-debug-assertions = false
-codegen-tests    = false
-
-[target.x86_64-unknown-linux-musl]
-llvm-config = "/usr/bin/llvm-config"
-crt-static  = false
-EOF
-
-export DESTDIR="$1"
-
-python3 ./x.py build -j "$(nproc)"
-python3 ./x.py install
-
-rm -rf "$1/usr/lib/rustlib/src/"

testing/rust/checksums

@@ -1,6 +0,0 @@
-c436034db42bc0ea7e7f32816ac6555b70d1f76c834407597966dfaf2ec839d6  rustc-1.45.0-src.tar.xz
-ff43c33836d5a56ce8089f8a0b101cbb12f130374e9631acdcc00f5f051f6429  rust-std-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-f023a98493b3617f3eecbc0744c88a9b4d4e1a8ac105d0cf50a9c191018facf6  rustc-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-d5d2a23e9cf67d0564cdfcb11fbca9c68719061c4a8581aa80f0e38617a609aa  cargo-0.45.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-13261c1288dd7ad3e376162041db017a0e2bcbcb77f974c0bc9bd0681361213e  musl.patch
-903880513dc61427bfedcd99c9b8a4b8156952b9cc5c486e29e5d5a2a77b484a  libressl-3.1.X.patch

testing/rust/depends

@@ -1,7 +0,0 @@
-cmake  make
-curl   make
-libressl
-llvm
-python make
-xz
-zlib

testing/rust/patches/libressl-3.1.X.patch

@@ -1,17 +0,0 @@
-diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
-index 162e11a66..9f3544313 100644
---- a/vendor/openssl-sys/build/main.rs
-+++ b/vendor/openssl-sys/build/main.rs
-@@ -204,6 +204,12 @@ See rust-openssl README for more information:
-             (3, 0, 0) => ('3', '0', '0'),
-             (3, 0, 1) => ('3', '0', '1'),
-             (3, 0, _) => ('3', '0', 'x'),
-+            (3, 1, 0) => ('3', '1', '0'),
-+            (3, 1, 1) => ('3', '1', '0'),
-+            (3, 1, _) => ('3', '1', 'x'),
-+            (3, 2, 0) => ('3', '2', '0'),
-+            (3, 2, 1) => ('3', '2', '0'),
-+            (3, 2, _) => ('3', '2', 'x'),
-             _ => version_error(),
-         };
-

testing/rust/patches/musl.patch

@@ -1,78 +0,0 @@
-diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index b3999118e..f809a8e99 100644
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -132,7 +132,7 @@ fn copy_third_party_objects(
-     // to using gcc from a glibc-targeting toolchain for linking.
-     // To do that we have to distribute musl startup objects as a part of Rust toolchain
-     // and link with them manually in the self-contained mode.
--    if target.contains("musl") {
-+    if target.contains("noop") {
-         let srcdir = builder.musl_root(target).unwrap().join("lib");
-         for &obj in &["crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
-             copy_and_stamp(&srcdir, obj);
-diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index 74b47d077..b700f8a09 100644
---- a/src/bootstrap/sanity.rs
-+++ b/src/bootstrap/sanity.rs
-@@ -192,7 +192,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 0fdd87608..63f00585f 100644
---- a/src/librustc_target/spec/linux_musl_base.rs
-+++ b/src/librustc_target/spec/linux_musl_base.rs
-@@ -15,7 +15,7 @@ pub fn opts() -> TargetOptions {
-     base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);
- 
-     // 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 146263925..c9aa30e2d 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 cc025da1a..0506db514 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 1084d9aa9..085c7ff9e 100644
---- a/vendor/libc/src/unix/mod.rs
-+++ b/vendor/libc/src/unix/mod.rs
-@@ -302,7 +302,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")))]

testing/rust/sources

@@ -1,6 +0,0 @@
-https://static.rust-lang.org/dist/rustc-1.45.0-src.tar.xz
-https://static.rust-lang.org/dist/2020-06-04/rust-std-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-06-04/rustc-1.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-06-04/cargo-0.45.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-patches/musl.patch
-patches/libressl-3.1.X.patch

testing/rust/version

@@ -1 +0,0 @@
-1.45.0 1