diff --git a/extra/rust/build b/extra/rust/build index 5e69e3da..96a5d696 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -1,6 +1,5 @@ #!/bin/sh -e -rm -f vendor/curl-sys/.cargo-checksum.json patch -p1 < fix-curl.patch # Instruct the compiler to trim absolute paths in resulting binaries and instead @@ -11,7 +10,7 @@ export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=." # bootstrap library to allow for the removal of the internet # connection requirement per build. { - mkdir -p "${cache_dir:=build/cache/2021-07-29}" + mkdir -p "${cache_dir:=build/cache/2021-09-09}" for tarball in *.tar.xz\?no-extract; do mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" @@ -31,6 +30,9 @@ done sed 's/\("files":{\)[^}]*/\1/' \ vendor/rustc-ap-rustc_target/.cargo-checksum.json > _ mv -f _ vendor/rustc-ap-rustc_target/.cargo-checksum.json +sed 's/\("files":{\)[^}]*/\1/' \ + vendor/curl-sys/.cargo-checksum.json > _ +mv -f _ vendor/curl-sys/.cargo-checksum.json cat > config.toml < _ - mv -f _ "$f" -done - -# Ignore checksums of files modified above. -sed 's/\("files":{\)[^}]*/\1/' \ - vendor/rustc-ap-rustc_target/.cargo-checksum.json > _ -mv -f _ vendor/rustc-ap-rustc_target/.cargo-checksum.json - -cat > config.toml <> config.toml - - mkdir -p libgcc - - printf 'INPUT(-lunwind)\n' > \ - libgcc/libgcc_s.so - - ln -sf "$KISS_ROOT/usr/lib/libunwind.so.1" \ - libgcc/libgcc_s.so.1 - - export \ - LD_LIBRARY_PATH="$PWD/libgcc:$LD_LIBRARY_PATH" \ - LIBRARY_PATH="$PWD/libgcc:$LIBRARY_PATH" -esac - -./x.py build -j "$(grep -scF 'core id' /proc/cpuinfo)" -./x.py install - -rm -rf \ - "$1/usr/lib/rustlib/src/" \ - "$1/usr/share/doc" \ - "$1/usr/share/zsh" \ - "$1/usr/lib/rustlib/uninstall.sh" - diff --git a/testing/rust/checksums b/testing/rust/checksums deleted file mode 100644 index 8f698d07..00000000 --- a/testing/rust/checksums +++ /dev/null @@ -1,5 +0,0 @@ -f13468889833c88e744ad579c5d8fbb7ecb53216159b54481a90e5dcdaa9e320 -a7f02bd5b4fd2b1f55edaddfa869d2ce210ce4951cb752ce7b380129bc2d1882 -0ddf6eccc6d005d39aaad3246ff157811a5a81c801f6e935c671299d24036c50 -9faa4514576c4beafcc7b640a17b57e8103f2f9c88f646c216ccce90b1a0cdf2 -f68fbed74118bff6df74dbdd1507e646e6627c95444fde90a6bb66b51b677cff diff --git a/testing/rust/depends b/testing/rust/depends deleted file mode 100644 index f70e18ce..00000000 --- a/testing/rust/depends +++ /dev/null @@ -1,8 +0,0 @@ -cmake make -curl make -llvm -openssl -pkgconf make -python make -xz -zlib diff --git a/testing/rust/sources b/testing/rust/sources deleted file mode 100644 index a1b23850..00000000 --- a/testing/rust/sources +++ /dev/null @@ -1,4 +0,0 @@ -https://static.rust-lang.org/dist/rustc-VERSION-src.tar.xz -https://static.rust-lang.org/dist/2021-09-09/rust-std-1.55.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2021-09-09/rustc-1.55.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2021-09-09/cargo-1.55.0-x86_64-unknown-linux-musl.tar.xz?no-extract diff --git a/testing/rust/version b/testing/rust/version deleted file mode 100644 index 89bac5a7..00000000 --- a/testing/rust/version +++ /dev/null @@ -1 +0,0 @@ -1.56.0 0