1 |
commit: 1808c612c0dc6b99670bfc32fa75c00782c3764e |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Sat Feb 3 20:46:29 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Feb 3 20:46:29 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1808c612 |
7 |
|
8 |
dev-lang/rust: backport the fix for MAKEOPTS |
9 |
|
10 |
dev-lang/rust/rust-1.21.0.ebuild | 6 +++--- |
11 |
dev-lang/rust/rust-1.23.0.ebuild | 6 +++--- |
12 |
2 files changed, 6 insertions(+), 6 deletions(-) |
13 |
|
14 |
diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild |
15 |
index e0a13e5..89bfe31 100644 |
16 |
--- a/dev-lang/rust/rust-1.21.0.ebuild |
17 |
+++ b/dev-lang/rust/rust-1.21.0.ebuild |
18 |
@@ -6,7 +6,7 @@ EAPI=6 |
19 |
LLVM_MAX_SLOT=4 |
20 |
PYTHON_COMPAT=( python2_7 ) |
21 |
|
22 |
-inherit python-any-r1 versionator toolchain-funcs llvm |
23 |
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm |
24 |
|
25 |
if [[ ${PV} = *beta* ]]; then |
26 |
betaver=${PV//*beta} |
27 |
@@ -173,11 +173,11 @@ src_configure() { |
28 |
} |
29 |
|
30 |
src_compile() { |
31 |
- ./x.py build || die |
32 |
+ ./x.py build -j$(makeopts_jobs) || die |
33 |
} |
34 |
|
35 |
src_install() { |
36 |
- env DESTDIR="${D}" ./x.py install || die |
37 |
+ env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die |
38 |
|
39 |
rm "${D}/usr/$(get_libdir)/rustlib/components" || die |
40 |
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die |
41 |
|
42 |
diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild |
43 |
index cf9be2c..f01a389 100644 |
44 |
--- a/dev-lang/rust/rust-1.23.0.ebuild |
45 |
+++ b/dev-lang/rust/rust-1.23.0.ebuild |
46 |
@@ -6,7 +6,7 @@ EAPI=6 |
47 |
LLVM_MAX_SLOT=4 |
48 |
PYTHON_COMPAT=( python2_7 ) |
49 |
|
50 |
-inherit python-any-r1 versionator toolchain-funcs llvm |
51 |
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm |
52 |
|
53 |
if [[ ${PV} = *beta* ]]; then |
54 |
betaver=${PV//*beta} |
55 |
@@ -178,11 +178,11 @@ src_configure() { |
56 |
} |
57 |
|
58 |
src_compile() { |
59 |
- ./x.py build || die |
60 |
+ ./x.py build -j$(makeopts_jobs) || die |
61 |
} |
62 |
|
63 |
src_install() { |
64 |
- env DESTDIR="${D}" ./x.py install || die |
65 |
+ env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die |
66 |
|
67 |
rm "${D}/usr/$(get_libdir)/rustlib/components" || die |
68 |
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die |