summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-12-13 08:41:37 +0000
committerMichał Górny <mgorny@gentoo.org>2014-12-13 08:41:37 +0000
commit59c1548f214a3b3c854d39614472845ccdc48604 (patch)
treee3efe58a7aa00bec855f5480eb7747e0fee505a7 /eclass
parentRename net-zope/zope-interface to dev-python/zope-interface. (diff)
downloadgentoo-2-59c1548f214a3b3c854d39614472845ccdc48604.tar.gz
gentoo-2-59c1548f214a3b3c854d39614472845ccdc48604.tar.bz2
gentoo-2-59c1548f214a3b3c854d39614472845ccdc48604.zip
Disable parallel run support.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/multilib-build.eclass10
-rw-r--r--eclass/multilib-minimal.eclass4
3 files changed, 12 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index b1a758105d00..65da08e4d73a 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1459 2014/12/12 17:30:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1460 2014/12/13 08:41:37 mgorny Exp $
+
+ 13 Dec 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass,
+ multilib-minimal.eclass:
+ Disable parallel run support.
12 Dec 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
Restrict tests for all release versions.
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 2e35d4739fc2..3509366fbd4f 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.64 2014/08/17 03:34:32 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.65 2014/12/13 08:41:37 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -223,18 +223,18 @@ multilib_foreach_abi() {
# @DESCRIPTION:
# If multilib support is enabled, sets the toolchain up for each
# supported ABI along with the ABI variable and correct BUILD_DIR,
-# and runs the given commands with them. The commands are run
-# in parallel with number of jobs being determined from MAKEOPTS.
+# and runs the given commands with them.
#
# If multilib support is disabled, it just runs the commands. No setup
# is done.
#
-# Useful for running configure scripts.
+# This function used to run multiple commands in parallel. Now it's just
+# a deprecated alias to multilib_foreach_abi.
multilib_parallel_foreach_abi() {
debug-print-function ${FUNCNAME} "${@}"
local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
- multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}"
+ multibuild_foreach_variant _multilib_multibuild_wrapper "${@}"
}
# @FUNCTION: multilib_for_best_abi
diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
index 4e1843e92cd9..e1a5ac422a9d 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.9 2014/05/02 16:16:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.10 2014/12/13 08:41:37 mgorny Exp $
# @ECLASS: multilib-minimal.eclass
# @MAINTAINER:
@@ -51,7 +51,7 @@ multilib-minimal_src_configure() {
popd >/dev/null || die
}
- multilib_parallel_foreach_abi multilib-minimal_abi_src_configure
+ multilib_foreach_abi multilib-minimal_abi_src_configure
}
multilib-minimal_src_compile() {