Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 28 Dec 2019 05:00:25
Message-Id: 1577509150.8c6a43f3e6666f25e66e21158f0ffcf35a3ed71c.gyakovlev@gentoo
1 commit: 8c6a43f3e6666f25e66e21158f0ffcf35a3ed71c
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 27 02:09:48 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 04:59:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6a43f3
7
8 cargo.eclass: move jobs configuration to generated configfile
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 eclass/cargo.eclass | 9 ++++++---
13 1 file changed, 6 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
16 index f050b0e81ac..f26495fc19c 100644
17 --- a/eclass/cargo.eclass
18 +++ b/eclass/cargo.eclass
19 @@ -139,6 +139,9 @@ cargo_gen_config() {
20
21 [net]
22 offline = true
23 +
24 + [build]
25 + jobs = $(makeopts_jobs)
26 EOF
27 }
28
29 @@ -150,7 +153,7 @@ cargo_src_compile() {
30
31 export CARGO_HOME="${ECARGO_HOME}"
32
33 - cargo build -vv -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
34 + cargo build -vv $(usex debug "" --release) "$@" \
35 || die "cargo build failed"
36 }
37
38 @@ -160,7 +163,7 @@ cargo_src_compile() {
39 cargo_src_install() {
40 debug-print-function ${FUNCNAME} "$@"
41
42 - cargo install -vv -j $(makeopts_jobs) --path ${CARGO_INSTALL_PATH} \
43 + cargo install -vv --path ${CARGO_INSTALL_PATH} \
44 --root="${ED}/usr" $(usex debug --debug "") "$@" \
45 || die "cargo install failed"
46 rm -f "${ED}/usr/.crates.toml"
47 @@ -174,7 +177,7 @@ cargo_src_install() {
48 cargo_src_test() {
49 debug-print-function ${FUNCNAME} "$@"
50
51 - cargo test -vv -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
52 + cargo test -vv $(usex debug "" --release) "$@" \
53 || die "cargo test failed"
54 }