diff options
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/.footprint | 55 | ||||
| -rw-r--r-- | rust/.signature | 13 | ||||
| -rw-r--r-- | rust/Pkgfile | 34 |
3 files changed, 45 insertions, 57 deletions
diff --git a/rust/.footprint b/rust/.footprint index e73af5ea8..7b41a4a64 100644 --- a/rust/.footprint +++ b/rust/.footprint @@ -6,7 +6,9 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cargo -rwxr-xr-x root/root usr/bin/cargo-clippy -rwxr-xr-x root/root usr/bin/cargo-fmt +-rwxr-xr-x root/root usr/bin/cargo-miri -rwxr-xr-x root/root usr/bin/clippy-driver +-rwxr-xr-x root/root usr/bin/miri -rwxr-xr-x root/root usr/bin/rls -rwxr-xr-x root/root usr/bin/rust-gdb -rwxr-xr-x root/root usr/bin/rust-gdbgui @@ -15,9 +17,11 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rustdoc -rwxr-xr-x root/root usr/bin/rustfmt drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/rustlib/ -rw-r--r-- root/root usr/lib/rustlib/install.log -rw-r--r-- root/root usr/lib/rustlib/manifest-cargo -rw-r--r-- root/root usr/lib/rustlib/manifest-clippy-preview +-rw-r--r-- root/root usr/lib/rustlib/manifest-miri-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rls-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-i686-unknown-linux-gnu -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu @@ -54,21 +58,27 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/alloc/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/binary_heap.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/append.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/entry.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/mem.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/merge_iter.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/navigate.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/node.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/node/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/node/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/remove.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/search.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/set.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/set/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/set/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/split.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/linked_list.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/linked_list/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/linked_list/tests.rs @@ -157,6 +167,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/ci/docker/x86_64 -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/ci/docker/x86_64-unknown-linux-musl/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile +-rwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/ci/miri-rustup.sh -rwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/ci/run-docker.sh -rwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/ci/run.sh -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/ci/runtest-android.rs @@ -167,6 +178,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/src/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/src/backtrace/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/backtrace/dbghelp.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/backtrace/libunwind.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/backtrace/miri.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/backtrace/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/backtrace/noop.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/capture.rs @@ -187,6 +199,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gi -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/mmap_windows.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/stash.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/libbacktrace.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/miri.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/noop.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/types.rs @@ -450,6 +463,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/num/flt2dec/str -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/i8.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/int_macros.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/nan.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/u16.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/u32.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/u64.rs @@ -465,6 +479,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/num/flt2dec/str -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/slice.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/str.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/str_lossy.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/task.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/time.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/tuple.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/panic_abort/ @@ -571,8 +586,12 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/fs/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/fs/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/future.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufreader.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufwriter.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/linewriter.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/linewritershim.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/cursor.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/cursor/ @@ -797,7 +816,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/os.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/path.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/pipe.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/process.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/rwlock.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/stack_overflow.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/stdio.rs @@ -934,42 +952,13 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/thread_local_key.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/time.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/alloc.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/args.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/cmath.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/condvar.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/env.rs -drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/ffi.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/fs.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/io.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/mod.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/process.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/raw.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/fd.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/fs.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/io.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/memchr.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/mod.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/mutex.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/net.rs -drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/net/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/net/tests.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/os.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/path.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/pipe.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/process/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/process/mod.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/process/process_common.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/process/process_vxworks.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/rand.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/rwlock.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/stack_overflow.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/stdio.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/thread.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/thread_local_dtor.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/thread_local_key.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/time.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/args.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/env.rs @@ -992,6 +981,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/args.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/condvar_atomics.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/env.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/futex_atomics.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/mutex_atomics.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/rwlock_atomics.rs @@ -1050,6 +1040,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/bytestring/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/bytestring/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar/check.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/fs.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/io.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/mod.rs @@ -1080,6 +1072,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/tests.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/thread/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/thread/available_concurrency.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/thread/local.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/thread/local/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/thread/local/dynamic_tests.rs diff --git a/rust/.signature b/rust/.signature index 9470b7fc8..420ef5e23 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,9 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YLB31dX/8Vdy5706uosq/+EvGAlxaY97DawZRTjpT8tqeEMdGYwsHlosovuecNz0VnP5L553zjrJD6ZqPMukw8= -SHA256 (Pkgfile) = 8257f80347cfc9a6f3d121f271b04c9792fca773600273c674500332b589c071 -SHA256 (.footprint) = 6723dc85447caa15b2681bdc2d0a27307601e18e9b908a33f363bc2fab15396e -SHA256 (rustc-1.48.0-src.tar.xz) = ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908 -SHA256 (rust-std-1.47.0-x86_64-unknown-linux-gnu.tar.xz) = a469db59f7df3a5e4003421d853b274e828b537d2d56fd5ce6bba8ba73266f02 -SHA256 (rustc-1.47.0-x86_64-unknown-linux-gnu.tar.xz) = 6effe67c3461335eabba2334f4747260bd479c938e635899a60ed094beec7481 -SHA256 (cargo-0.48.0-x86_64-unknown-linux-gnu.tar.xz) = 6958f9797b7acacb708423c61f5e8b23c63d9e96fdc7c07fdb0a3feafeaf27e9 +RWSE3ohX2g5d/fnUXwX2rW+e7nZi+mUqxPYLPp2PLqnr/ZkHNHaTfJpYY5APJik8c5qDHUbGx+9r3VfymYYa8+4TgBVY6ATCAAs= +SHA256 (Pkgfile) = 0102ab0a7552c4a32952df90011e062449e765e533ed76e0e7629ef12da60547 +SHA256 (.footprint) = 989202347b109e2bd6a65dbc3b083362fb1b9bd66d820e1046681e3ff5c9b49a +SHA256 (rustc-1.49.0-src.tar.xz) = ebe910edc824a0a037a10be443446a0511923ba8342fa3c331ec8a22481d5d15 +SHA256 (rust-std-1.48.0-x86_64-unknown-linux-gnu.tar.xz) = 1c00a6a0dabbf6290728b09f9307d9fa6cc985487f727075c68acd4a600ef3f8 +SHA256 (rustc-1.48.0-x86_64-unknown-linux-gnu.tar.xz) = fc4d292a52cbb6b84fb9f065d0d7596064a9b957381d639d5a750d6e2bf02483 SHA256 (compiler-rt-11.0.0.src.tar.xz) = 374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234 diff --git a/rust/Pkgfile b/rust/Pkgfile index e0b659728..b1d104289 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -2,22 +2,18 @@ # URL: https://www.rust-lang.org/ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: llvm -# Optional: sccache +# Optional: sccache ccache name=rust -version=1.48.0 -_date=2020-10-08 -_rustc=1.47.0 -_cargo=0.48.0 +version=1.49.0 +_date=2020-11-19 +_rustc=1.48.0 _llvm=11.0.0 release=1 -source=( - https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz +source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-gnu.tar.xz - https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm/compiler-rt-$_llvm.src.tar.xz -) + https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm/compiler-rt-$_llvm.src.tar.xz) unpack_source() { for file in ${source[@]}; do @@ -41,7 +37,6 @@ build() { local ERROR local DATE="$(awk '/^date: / { print $2 }' src/stage0.txt)" local RUSTC="$(awk '/^rustc: / { print $2 }' src/stage0.txt)" - local CARGO="$(awk '/^cargo: / { print $2 }' src/stage0.txt)" if [ "$DATE" != "$_date" ]; then printf "\e[031mError: _date $_date != $DATE\033[0m\n" ERROR=1 @@ -50,17 +45,14 @@ build() { printf "\e[031mError: _rustc $_rustc != $RUSTC\033[0m\n" ERROR=1 fi - if [ "$CARGO" != "$_cargo" ]; then - printf "\e[031mError: _cargo $_cargo != $CARGO\033[0m\n" - ERROR=1 - fi [ $ERROR ] && exit 1 - unset DATE RUSTC CARGO ERROR + unset DATE RUSTC ERROR cat <<- EOF > $SRC/config.toml [llvm] ninja = true link-shared = true + @CCACHE@ [install] prefix = "/usr" @@ -68,8 +60,6 @@ cat <<- EOF > $SRC/config.toml [rust] channel = "stable" rpath = false - codegen-units-std = 1 - debuginfo-level-std = 2 [build] target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] @@ -100,6 +90,12 @@ EOF sed -e 's|@CARGO@||' -e 's|@RUST@||' -i $SRC/config.toml fi + if [ -e '/usr/bin/ccache' ]; then + sed -e 's|@CCACHE@|ccache = "/usr/bin/ccache"|' -i $SRC/config.toml + else + sed -e 's|@CCACHE@||' -i $SRC/config.toml + fi + cat $SRC/config.toml mkdir "$PKGMK_SOURCE_DIR/rust" || true @@ -134,5 +130,5 @@ EOF done < <(find "$PKG/usr/lib/rustlib" -path '*/analysis/*.json' -print0) install -d $PKG/etc/revdep.d - echo "/usr/lib/rustlib/i686-unknown-linux-gnu/lib" > $PKG/etc/revdep.d/rust + echo "/usr/lib/rustlib/i686-unknown-linux-gnu/lib" > $PKG/etc/revdep.d/$name } |