diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-20 20:18:52 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-20 20:16:44 +0200 |
| commit | 7d8e5d4fea0233a03c8d58bd295a8d9a077caa81 (patch) | |
| tree | 6ef803f947289473c56e6fbb28b0214f55d79ed7 /community/rust | |
| parent | d0e3b62002af8d78e3ac33a8ada0412ce2fe1da1 (diff) | |
| download | aports-7d8e5d4fea0233a03c8d58bd295a8d9a077caa81.tar.bz2 aports-7d8e5d4fea0233a03c8d58bd295a8d9a077caa81.tar.xz | |
community/rust: simplify abuild, set RUST* env. vars on top-level
Diffstat (limited to 'community/rust')
| -rw-r--r-- | community/rust/APKBUILD | 26 | ||||
| -rwxr-xr-x | community/rust/check-rustc | 3 |
2 files changed, 12 insertions, 17 deletions
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD index 7c94cc92ce..06a8e408dc 100644 --- a/community/rust/APKBUILD +++ b/community/rust/APKBUILD @@ -83,6 +83,11 @@ _sharedir="usr/share/rust" ldpath="/$_rlibdir" +export RUST_BACKTRACE=1 +export RUSTC_CRT_STATIC="false" +# Convince libgit2-sys to use the distro libgit2. +export LIBGIT2_SYS_USE_PKG_CONFIG=1 + prepare() { default_prepare @@ -95,9 +100,6 @@ prepare() { build() { cd "$builddir" - # Convince libgit2-sys to use the distro libgit2. - export LIBGIT2_SYS_USE_PKG_CONFIG=1 - # jemalloc is disabled, because it increases size of statically linked # binaries produced by rustc (stripped hello_world 186 kiB vs. 358 kiB) # for only tiny performance boost (even negative in some tests). @@ -120,9 +122,7 @@ build() { --enable-vendor \ --disable-jemalloc - RUST_BACKTRACE=1 \ - RUSTC_CRT_STATIC="false" \ - ./x.py build -v --jobs ${JOBS:-2} + ./x.py build -v --jobs ${JOBS:-2} } check() { @@ -134,24 +134,16 @@ check() { # cd "$builddir" # make check \ # LD_LIBRARY_PATH="$_stage0dir/lib" \ -# RUST_BACKTRACE=1 \ -# RUSTC_CRT_STATIC="false" \ # VERBOSE=1 msg "Running tests for cargo..." - RUST_BACKTRACE=full \ - RUSTC_CRT_STATIC="false" \ - CFG_DISABLE_CROSS_TESTS=1 \ - ./x.py test --no-fail-fast src/tools/cargo + CFG_DISABLE_CROSS_TESTS=1 ./x.py test --no-fail-fast src/tools/cargo } package() { cd "$builddir" - RUST_BACKTRACE=1 \ - RUSTC_CRT_STATIC="false" \ - DESTDIR="$pkgdir" \ - ./x.py install -v + DESTDIR="$pkgdir" ./x.py install -v cd "$pkgdir" @@ -290,4 +282,4 @@ df8caff62724e4d4ced52a72f919c3b41f272b5e547dac5aaccbc70f0cae2edf0002c755275e2289 a1c6cc6181d48e313c9c976cb403437cee8d49bda6ef612df7bc21981abc21177b6682ae6b1e4d4906d97ab21f32b310272f57b97ad68ad0f351cd923afeb2f2 cargo-libressl27x.patch 332a6af59edc507baa73eda1de60591dd4202f540541769ac1bcbc731267f4523ea309d2c3b1f5a9dc3db32831942a5d3d40b81882dad0bf0b5ee7f74f1d6477 cargo-tests-fix-build-auth-http_auth_offered.patch 3d6f027088e1ec189ce864bf5ed150ccad8be5d9fc0973f1b4d202eec6eab865834403335a9f0765bbfa54638aed7f5d5f2183ba9dfeab9f5bc4ef48111a8427 cargo-tests-ignore-resolving_minimum_version_with_transitive_deps.patch -79549055dea81379c890b495c82456ab497a9179ec6702c59e11d0748bc668f47fc3d6a69c27a0545bb87c01318631dffc69260bf2d4badc75f53cbf7fad7528 check-rustc" +c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125 check-rustc" diff --git a/community/rust/check-rustc b/community/rust/check-rustc index 2e96a45f60..d4b85be764 100755 --- a/community/rust/check-rustc +++ b/community/rust/check-rustc @@ -6,6 +6,9 @@ RUSTC="$1" TMPDIR="$(pwd)/.tmp-${0##*/}-$RANDOM" failed=0 +unset RUST_BACKTRACE +unset RUSTC_CRT_STATIC + _rustc() { printf '\n$ rustc %s\n' "$*" |