Disable parallel run support to make things easier for developers and more predictable for users.

3 files changed, 14 insertions, 42 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index dd7fe1eb9cd0..fdf7fb833b94 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1454 2014/12/07 07:23:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1455 2014/12/07 19:15:18 mgorny Exp $
+
+  07 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
+  python-r1.eclass:
+  Disable parallel run support to make things easier for developers and more
+  predictable for users.
 
   07 Dec 2014; Hans de Graaff <graaff@gentoo.org> ruby-fakegem.eclass:
   Allow additional content to be injected in the ruby bin wrapper.
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 8c220db957fd..675766b0ce5b 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.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/distutils-r1.eclass,v 1.103 2014/11/24 01:39:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.104 2014/12/07 19:15:19 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -181,20 +181,6 @@ fi
 # 'build --build-base ${BUILD_DIR}' to enforce keeping & using built
 # files in the specific root.
 
-# @ECLASS-VARIABLE: DISTUTILS_NO_PARALLEL_BUILD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If set to a non-null value, the parallel build feature will
-# be disabled.
-#
-# When parallel builds are used, the implementation-specific sub-phases
-# for selected Python implementation will be run in parallel. This will
-# increase build efficiency with distutils which does not do parallel
-# builds.
-#
-# This variable can be used to disable the afore-mentioned feature
-# in case it causes issues with the package.
-
 # @ECLASS-VARIABLE: mydistutilsargs
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -607,13 +593,6 @@ distutils-r1_run_phase() {
 	fi
 	local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 
-	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		local -x TMPDIR=${T}/${EPYTHON}
-		local -x HOME=${TMPDIR}/home
-
-		mkdir -p "${TMPDIR}" "${HOME}" || die
-	fi
-
 	# Set up build environment, bug #513664.
 	local -x AR=${AR} CC=${CC} CPP=${CPP} CXX=${CXX}
 	tc-export AR CC CPP CXX
@@ -672,12 +651,7 @@ _distutils-r1_run_foreach_impl() {
 	set -- distutils-r1_run_phase "${@}"
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
-		then
-			python_foreach_impl "${@}"
-		else
-			python_parallel_foreach_impl "${@}"
-		fi
+		python_foreach_impl "${@}"
 	else
 		if [[ ! ${EPYTHON} ]]; then
 			die "EPYTHON unset, python-single-r1_pkg_setup not called?!"
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 5a4336d847c1..482e6462be4f 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.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/python-r1.eclass,v 1.79 2014/11/22 02:38:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.80 2014/12/07 19:15:19 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -217,14 +217,6 @@ _python_set_globals() {
 }
 _python_set_globals
 
-# @ECLASS-VARIABLE: DISTUTILS_JOBS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The number of parallel jobs to run for distutils-r1 parallel builds.
-# If unset, the job-count in ${MAKEOPTS} will be used.
-#
-# This variable is intended to be set in make.conf.
-
 # @FUNCTION: _python_validate_useflags
 # @INTERNAL
 # @DESCRIPTION:
@@ -725,15 +717,16 @@ python_foreach_impl() {
 # For each command being run, EPYTHON, PYTHON and BUILD_DIR are set
 # locally, and the former two are exported to the command environment.
 #
-# Multiple invocations of the command will be run in parallel, up to
-# DISTUTILS_JOBS (defaulting to '-j' option argument from MAKEOPTS).
+# This command used to be the parallel variant of python_foreach_impl.
+# However, the parallel run support has been removed to simplify
+# the eclasses and make them more predictable and therefore it is now
+# only a deprecated alias to python_foreach_impl.
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local MULTIBUILD_JOBS=${MULTIBUILD_JOBS:-${DISTUTILS_JOBS}}
 	local MULTIBUILD_VARIANTS
 	_python_obtain_impls
-	multibuild_parallel_foreach_variant _python_multibuild_wrapper "${@}"
+	multibuild_foreach_variant _python_multibuild_wrapper "${@}"
 }
 
 # @FUNCTION: python_setup