rust: bump to 1.41.1

This commit is contained in:
Dylan Araps 2020-02-27 22:05:15 +02:00
parent 0e367f9886
commit 9c46ea764f
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
4 changed files with 33 additions and 25 deletions

View File

@ -1,20 +1,19 @@
#!/bin/sh -e #!/bin/sh -e
patch -p1 < musl.patch
# This package mimics the download process of rust's 'x.py' # This package mimics the download process of rust's 'x.py'
# bootstrap library to allow for the removal of the internet # bootstrap library to allow for the removal of the internet
# connection requirement per build. # connection requirement per build.
{ {
cache_dir=build/cache/2019-12-19 mkdir -p "${cache_dir:=build/cache/2019-12-19}"
mkdir -p "$cache_dir"
for tarball in *.tar.xz\?no-extract; do for tarball in *.tar.xz\?no-extract; do
mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
done done
} }
patch -p1 < musl.patch # 'rust' checksums files in 'vendor/', but we patch a few.
# 'rust' checksums files in 'vendor/', but we patch a few files.
for vendor in libc openssl-sys; do for vendor in libc openssl-sys; do
sed -i 's/\("files":{\)[^}]*/\1/' "vendor/$vendor/.cargo-checksum.json" sed -i 's/\("files":{\)[^}]*/\1/' "vendor/$vendor/.cargo-checksum.json"
done done
@ -24,32 +23,41 @@ cat > config.toml <<EOF
link-shared = true link-shared = true
[build] [build]
build = "x86_64-unknown-linux-musl" build = "x86_64-unknown-linux-musl"
host = [ "x86_64-unknown-linux-musl" ] host = [ "x86_64-unknown-linux-musl" ]
target = [ "x86_64-unknown-linux-musl" ] target = [ "x86_64-unknown-linux-musl" ]
docs = false
extended = true docs = false
submodules = false compiler-docs = false
python = "python3" extended = true
locked-deps = true submodules = false
vendor = true python = "python3"
locked-deps = true
vendor = true
sanitizers = false
profiler = false
full-bootstrap = false
[install] [install]
prefix = "/usr" prefix = "/usr"
[rust] [rust]
channel = "stable" channel = "stable"
rpath = false rpath = false
codegen-units = 1 codegen-units = 1
debuginfo-level = 0 debuginfo-level = 0
backtrace = false debug = false
jemalloc = false backtrace = false
codegen-tests = false jemalloc = false
debug-assertions = false
codegen-tests = false
[target.x86_64-unknown-linux-musl] [target.x86_64-unknown-linux-musl]
llvm-config = "/usr/bin/llvm-config" llvm-config = "/usr/bin/llvm-config"
crt-static = false crt-static = false
EOF EOF
export DESTDIR="$1"
python3 ./x.py build -j "$(nproc)" python3 ./x.py build -j "$(nproc)"
DESTDIR="$1" python3 ./x.py install python3 ./x.py install

View File

@ -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 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 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 848646326474392bdac70a5bfa06efda4c36e2bbbf088f07456f98c7575844e1 cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract

View File

@ -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/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/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 https://static.rust-lang.org/dist/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract

View File

@ -1 +1 @@
1.41.0 1 1.41.1 1