From c918cf961d3aa6f7d5779ad1dbcf293d516d5453 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Wed, 4 Mar 2020 10:54:29 +0300
Subject: rust: bump to 1.41.1
---
extra/rust/build | 55 +++++++++++++++++++++++++++++-----------------------
extra/rust/checksums | 2 +-
extra/rust/sources | 2 +-
extra/rust/version | 2 +-
4 files changed, 34 insertions(+), 27 deletions(-)
(limited to 'extra/rust')
diff --git a/extra/rust/build b/extra/rust/build
index f918b150..1acbb91b 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -1,21 +1,19 @@
#!/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 further enabling checksums
-# and signature verification by KISS.
+# connection requirement per build.
{
- cache_dir=build/cache/2019-12-19
- mkdir -p "$cache_dir"
+ mkdir -p "${cache_dir:=build/cache/2019-12-19}"
for tarball in *.tar.xz\?no-extract; do
mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
done
}
-patch -p1 < musl.patch
-
-# 'rust' checksums files in 'vendor/', but we patch a few files.
+# '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
@@ -25,32 +23,41 @@ cat > config.toml <<EOF
link-shared = true
[build]
-build = "x86_64-unknown-linux-musl"
-host = [ "x86_64-unknown-linux-musl" ]
+build = "x86_64-unknown-linux-musl"
+host = [ "x86_64-unknown-linux-musl" ]
target = [ "x86_64-unknown-linux-musl" ]
-docs = false
-extended = true
-submodules = false
-python = "python3"
-locked-deps = true
-vendor = true
+
+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
-backtrace = false
-jemalloc = false
-codegen-tests = false
+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
+crt-static = false
EOF
+export DESTDIR="$1"
+
python3 ./x.py build -j "$(nproc)"
-DESTDIR="$1" python3 ./x.py install
+python3 ./x.py install
diff --git a/extra/rust/checksums b/extra/rust/checksums
index 70c8ff17..7c22482f 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,4 +1,4 @@
-38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f rustc-1.41.0-src.tar.xz
+ebac9861b43c7207af36e24402dfdc5463a4df4bdb015ccb2b165251c0fdcf7c rustc-1.41.1-src.tar.xz
c647bb7f399b3d18e345b2dab1fb073470582a9298e83d8648f6661544df7279 rust-std-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
769b9e31557fcc0ea2a661f88b679d3dbd62b537807c7b3c75ac6816a1be4fa3 rustc-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
848646326474392bdac70a5bfa06efda4c36e2bbbf088f07456f98c7575844e1 cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract
diff --git a/extra/rust/sources b/extra/rust/sources
index 0ca17083..15440df2 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,4 +1,4 @@
-https://static.rust-lang.org/dist/rustc-1.41.0-src.tar.xz
+https://static.rust-lang.org/dist/rustc-1.41.1-src.tar.xz
https://static.rust-lang.org/dist/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
https://static.rust-lang.org/dist/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
https://static.rust-lang.org/dist/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract
diff --git a/extra/rust/version b/extra/rust/version
index bab56fdc..fdf97314 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.41.0 1
+1.41.1 1
--
cgit v1.2.3