Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2018-02-05 17:11:27 -0800
committerAric Belsito <lluixhi@gmail.com>2018-02-05 17:11:27 -0800
commit84bf3839de44aecb7112dca27ebe4af1f39d3017 (patch)
tree43b441354fe3eb73337a843bb1771e2b2316c0c0
parentdev-lang/rust: add missing "extended" dependency (diff)
parentdev-lang/rust: backport the fix for MAKEOPTS (diff)
downloadmusl-84bf3839de44aecb7112dca27ebe4af1f39d3017.tar.gz
musl-84bf3839de44aecb7112dca27ebe4af1f39d3017.tar.bz2
musl-84bf3839de44aecb7112dca27ebe4af1f39d3017.zip
Merge remote-tracking branch 'github/pr/95'
Diffstat
-rw-r--r--dev-lang/rust/rust-1.21.0.ebuild6
-rw-r--r--dev-lang/rust/rust-1.23.0-r1.ebuild6
-rw-r--r--dev-lang/rust/rust-1.23.0.ebuild6
-rw-r--r--dev-util/cargo/cargo-0.22.0-r1.ebuild4
-rw-r--r--dev-util/cargo/cargo-0.23.0.ebuild4
-rw-r--r--dev-util/cargo/cargo-0.24.0.ebuild4
6 files changed, 15 insertions, 15 deletions
diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild
index e0a13e56..89bfe315 100644
--- a/dev-lang/rust/rust-1.21.0.ebuild
+++ b/dev-lang/rust/rust-1.21.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
LLVM_MAX_SLOT=4
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 versionator toolchain-funcs llvm
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm
if [[ ${PV} = *beta* ]]; then
betaver=${PV//*beta}
@@ -173,11 +173,11 @@ src_configure() {
}
src_compile() {
- ./x.py build || die
+ ./x.py build -j$(makeopts_jobs) || die
}
src_install() {
- env DESTDIR="${D}" ./x.py install || die
+ env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die
rm "${D}/usr/$(get_libdir)/rustlib/components" || die
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die
diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild b/dev-lang/rust/rust-1.23.0-r1.ebuild
index 7f1948f5..3e9e387f 100644
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
LLVM_MAX_SLOT=4
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 versionator toolchain-funcs llvm
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm
if [[ ${PV} = *beta* ]]; then
betaver=${PV//*beta}
@@ -194,11 +194,11 @@ src_configure() {
}
src_compile() {
- ./x.py build || die
+ ./x.py build -j$(makeopts_jobs) || die
}
src_install() {
- env DESTDIR="${D}" ./x.py install || die
+ env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die
rm "${D}/usr/$(get_libdir)/rustlib/components" || die
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die
diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild
index cf9be2cd..f01a3896 100644
--- a/dev-lang/rust/rust-1.23.0.ebuild
+++ b/dev-lang/rust/rust-1.23.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
LLVM_MAX_SLOT=4
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 versionator toolchain-funcs llvm
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm
if [[ ${PV} = *beta* ]]; then
betaver=${PV//*beta}
@@ -178,11 +178,11 @@ src_configure() {
}
src_compile() {
- ./x.py build || die
+ ./x.py build -j$(makeopts_jobs) || die
}
src_install() {
- env DESTDIR="${D}" ./x.py install || die
+ env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die
rm "${D}/usr/$(get_libdir)/rustlib/components" || die
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die
diff --git a/dev-util/cargo/cargo-0.22.0-r1.ebuild b/dev-util/cargo/cargo-0.22.0-r1.ebuild
index 0b10511e..4c1ff2b4 100644
--- a/dev-util/cargo/cargo-0.22.0-r1.ebuild
+++ b/dev-util/cargo/cargo-0.22.0-r1.ebuild
@@ -121,7 +121,7 @@ wincolor-0.1.4
ws2_32-sys-0.2.1
"
-inherit bash-completion-r1 cargo versionator
+inherit multiprocessing bash-completion-r1 cargo versionator
case "${CHOST}" in
armv7a-hardfloat-*)
@@ -208,7 +208,7 @@ src_configure() {
src_compile() {
export CARGO_HOME="${ECARGO_HOME}"
local cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
- ${cargo} build --release || die
+ ${cargo} build --release -j$(makeopts_jobs) || die
# Building HTML documentation
use doc && ${cargo} doc
diff --git a/dev-util/cargo/cargo-0.23.0.ebuild b/dev-util/cargo/cargo-0.23.0.ebuild
index 6ac0726b..21af2318 100644
--- a/dev-util/cargo/cargo-0.23.0.ebuild
+++ b/dev-util/cargo/cargo-0.23.0.ebuild
@@ -128,7 +128,7 @@ wincolor-0.1.4
ws2_32-sys-0.2.1
"
-inherit bash-completion-r1 cargo versionator
+inherit multiprocessing bash-completion-r1 cargo versionator
case "${CHOST}" in
armv7a-hardfloat-*)
@@ -215,7 +215,7 @@ src_configure() {
src_compile() {
export CARGO_HOME="${ECARGO_HOME}"
local cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
- ${cargo} build --release || die
+ ${cargo} build --release -j$(makeopts_jobs) || die
# Building HTML documentation
use doc && ${cargo} doc
diff --git a/dev-util/cargo/cargo-0.24.0.ebuild b/dev-util/cargo/cargo-0.24.0.ebuild
index b1c79789..b04241b7 100644
--- a/dev-util/cargo/cargo-0.24.0.ebuild
+++ b/dev-util/cargo/cargo-0.24.0.ebuild
@@ -132,7 +132,7 @@ wincolor-0.1.4
ws2_32-sys-0.2.1
"
-inherit bash-completion-r1 cargo versionator
+inherit multiprocessing bash-completion-r1 cargo versionator
case "${CHOST}" in
armv7a-hardfloat-*)
@@ -217,7 +217,7 @@ src_configure() {
src_compile() {
export CARGO_HOME="${ECARGO_HOME}"
local cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
- ${cargo} build --release || die
+ ${cargo} build --release -j$(makeopts_jobs) || die
# Building HTML documentation
use doc && ${cargo} doc