aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstefson <herrtimson@yahoo.de>2018-03-09 13:07:04 +0100
committerAnthony G. Basile <blueness@gentoo.org>2018-03-16 09:20:13 -0400
commit5d883c02e17b4c9202fcd7bdbf3695b855d70f7f (patch)
treed6c2792cff9b3903ca178698ee8d33abb95c4058 /dev-util
parentsys-fs/xfsprogs: all relevant bugs fixed upstream with 4.14, which is stable ... (diff)
downloadmusl-5d883c02e17b4c9202fcd7bdbf3695b855d70f7f.tar.gz
musl-5d883c02e17b4c9202fcd7bdbf3695b855d70f7f.tar.bz2
musl-5d883c02e17b4c9202fcd7bdbf3695b855d70f7f.zip
Revert "dev-util/cargo: make the build system honor MAKEOPTS from make.conf"
Fixed in tree via cargo.eclass instead, no need to have it in both and possibly conflicting. This reverts commit 16b43a596efd4262efcd5f07ee50da57cb4afc07.
Diffstat (limited to 'dev-util')
-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
3 files changed, 6 insertions, 6 deletions
diff --git a/dev-util/cargo/cargo-0.22.0-r1.ebuild b/dev-util/cargo/cargo-0.22.0-r1.ebuild
index 4c1ff2b..0b10511 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 multiprocessing bash-completion-r1 cargo versionator
+inherit 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 -j$(makeopts_jobs) || die
+ ${cargo} build --release || 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 21af231..6ac0726 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 multiprocessing bash-completion-r1 cargo versionator
+inherit 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 -j$(makeopts_jobs) || die
+ ${cargo} build --release || 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 b04241b..b1c7978 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 multiprocessing bash-completion-r1 cargo versionator
+inherit 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 -j$(makeopts_jobs) || die
+ ${cargo} build --release || die
# Building HTML documentation
use doc && ${cargo} doc