* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass
@ 2012-10-15 15:01 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-15 15:01 UTC (permalink / raw
To: gentoo-commits
mgorny 12/10/15 15:01:18
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
Log:
Enable EAPI 5 support.
Revision Changes Path
1.447 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.447&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.447&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.446&r2=1.447
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- ChangeLog 15 Oct 2012 12:51:20 -0000 1.446
+++ ChangeLog 15 Oct 2012 15:01:18 -0000 1.447
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.446 2012/10/15 12:51:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.447 2012/10/15 15:01:18 mgorny Exp $
+
+ 15 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
+ python-r1.eclass:
+ Enable EAPI 5 support.
15 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Fix missing wrapper symlinks when first supported Python implementation is
1.3 eclass/distutils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.2&r2=1.3
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- distutils-r1.eclass 15 Oct 2012 12:51:20 -0000 1.2
+++ distutils-r1.eclass 15 Oct 2012 15:01:18 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.2 2012/10/15 12:51:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.3 2012/10/15 15:01:18 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -40,7 +40,7 @@
0|1|2|3)
die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
;;
- 4)
+ 4|5)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
1.2 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.1&r2=1.2
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-r1.eclass 14 Oct 2012 10:51:28 -0000 1.1
+++ python-r1.eclass 15 Oct 2012 15:01:18 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.1 2012/10/14 10:51:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.2 2012/10/15 15:01:18 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -24,7 +24,7 @@
0|1|2|3)
die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
;;
- 4)
+ 4|5)
# EAPI=4 needed for REQUIRED_USE
;;
*)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass
@ 2012-12-16 23:26 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-16 23:26 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/16 23:26:15
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
Log:
Remove outdated comments and checks.
Revision Changes Path
1.564 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.564&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.564&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.563&r2=1.564
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- ChangeLog 16 Dec 2012 21:42:33 -0000 1.563
+++ ChangeLog 16 Dec 2012 23:26:15 -0000 1.564
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.563 2012/12/16 21:42:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.564 2012/12/16 23:26:15 mgorny Exp $
+
+ 16 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
+ python-r1.eclass:
+ Remove outdated comments and checks.
16 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Temporarily disable PYTHON_SINGLE_TARGET safety check because of issues with
1.33 eclass/distutils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.32&r2=1.33
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- distutils-r1.eclass 13 Dec 2012 16:47:25 -0000 1.32
+++ distutils-r1.eclass 16 Dec 2012 23:26:15 -0000 1.33
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.32 2012/12/13 16:47:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.33 2012/12/16 23:26:15 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -282,7 +282,6 @@
[[ ${path} ]] || die "${FUNCNAME}: no path given"
local f
- # XXX: change this if we ever allow directories in bin/sbin
while IFS= read -r -d '' f; do
debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
1.28 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.27&r2=1.28
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- python-r1.eclass 16 Dec 2012 21:42:33 -0000 1.27
+++ python-r1.eclass 16 Dec 2012 23:26:15 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.27 2012/12/16 21:42:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.28 2012/12/16 23:26:15 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -480,10 +480,6 @@
python_replicate_script() {
debug-print-function ${FUNCNAME} "${@}"
- if [[ ${_PYTHON_SINGLE_R1} ]]; then
- die "${FUNCNAME} must not be used with python-single-r1 eclass."
- fi
-
local suffixes=()
_add_suffix() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass
@ 2013-02-26 14:33 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-26 14:33 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/26 14:33:45
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
Log:
Introduce the parallel variant of python_foreach_impl().
Revision Changes Path
1.686 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.686&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.686&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.685&r2=1.686
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -r1.685 -r1.686
--- ChangeLog 26 Feb 2013 14:32:49 -0000 1.685
+++ ChangeLog 26 Feb 2013 14:33:45 -0000 1.686
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.685 2013/02/26 14:32:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.686 2013/02/26 14:33:45 mgorny Exp $
+
+ 26 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
+ python-r1.eclass:
+ Introduce the parallel variant of python_foreach_impl().
26 Feb 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Make python_foreach_impl() non-fatal, expect explicit die inside or outside.
1.55 eclass/distutils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.54&r2=1.55
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- distutils-r1.eclass 21 Feb 2013 23:18:56 -0000 1.54
+++ distutils-r1.eclass 26 Feb 2013 14:33:45 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.54 2013/02/21 23:18:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.55 2013/02/26 14:33:45 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -100,14 +100,6 @@
DEPEND=${PYTHON_DEPS}
fi
-# @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.
-
# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
# @DESCRIPTION:
1.42 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.41&r2=1.42
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- python-r1.eclass 26 Feb 2013 14:32:49 -0000 1.41
+++ python-r1.eclass 26 Feb 2013 14:33:45 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.41 2013/02/26 14:32:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.42 2013/02/26 14:33:45 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -173,6 +173,14 @@
}
_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:
@@ -623,6 +631,52 @@
return ${ret}
}
+# @FUNCTION: python_parallel_foreach_impl
+# @USAGE: <command> [<args>...]
+# @DESCRIPTION:
+# Run the given command for each of the enabled Python implementations.
+# If additional parameters are passed, they will be passed through
+# to the command.
+#
+# The function will return 0 status if all invocations succeed.
+# Otherwise, the return code from first failing invocation will
+# be returned.
+#
+# 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).
+python_parallel_foreach_impl() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local ret lret
+
+ _python_parallel() {
+ (
+ multijob_child_init
+ "${@}"
+ ) &
+ multijob_post_fork
+ }
+
+ local opts
+ if [[ ${DISTUTILS_JOBS} ]]; then
+ opts=-j${DISTUTILS_JOBS}
+ else
+ opts=${MAKEOPTS}
+ fi
+
+ multijob_init "${opts}"
+ python_foreach_impl _python_parallel "${@}"
+ ret=${?}
+ multijob_finish
+ lret=${?}
+
+ [[ ${ret} -eq 0 ]] && ret=${lret}
+ return ${ret}
+}
+
# @FUNCTION: python_export_best
# @USAGE: [<variable>...]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass
@ 2013-03-04 19:28 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-04 19:28 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/04 19:28:47
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
Log:
Introduce python_parallel_foreach_impl() and reuse it in distutils-r1.
Revision Changes Path
1.710 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.710&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.710&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.709&r2=1.710
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.709
retrieving revision 1.710
diff -u -r1.709 -r1.710
--- ChangeLog 4 Mar 2013 19:27:58 -0000 1.709
+++ ChangeLog 4 Mar 2013 19:28:47 -0000 1.710
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.709 2013/03/04 19:27:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.710 2013/03/04 19:28:47 mgorny Exp $
+
+ 04 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
+ python-r1.eclass:
+ Introduce python_parallel_foreach_impl() and reuse it in distutils-r1.
04 Mar 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Use multibuild.eclass in python-r1.
1.61 eclass/distutils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.60&r2=1.61
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- distutils-r1.eclass 2 Mar 2013 07:17:50 -0000 1.60
+++ distutils-r1.eclass 4 Mar 2013 19:28:47 -0000 1.61
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.60 2013/03/02 07:17:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.61 2013/03/04 19:28:47 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -100,14 +100,6 @@
DEPEND=${PYTHON_DEPS}
fi
-# @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.
-
# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -551,16 +543,7 @@
mkdir -p "${TMPDIR}" || die
- if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
- then
- "${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
- else
- (
- multijob_child_init
- "${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
- ) &
- multijob_post_fork
- fi
+ "${@}"
if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
then
@@ -603,39 +586,6 @@
fi
}
-# @FUNCTION: _distutils-r1_multijob_init
-# @INTERNAL
-# @DESCRIPTION:
-# Init multijob, taking the job-count from ${DISTUTILS_JOBS}.
-_distutils-r1_multijob_init() {
- debug-print-function ${FUNCNAME} "${@}"
-
- if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
- then
- local opts
- if [[ ${DISTUTILS_JOBS} ]]; then
- opts=-j${DISTUTILS_JOBS}
- else
- opts=${MAKEOPTS}
- fi
-
- multijob_init "${opts}"
- fi
-}
-
-# @FUNCTION: _distutils-r1_multijob_finish
-# @INTERNAL
-# @DESCRIPTION:
-# Finish multijob if used.
-_distutils-r1_multijob_finish() {
- debug-print-function ${FUNCNAME} "${@}"
-
- if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
- then
- multijob_finish
- fi
-}
-
# @FUNCTION: _distutils-r1_run_foreach_impl
# @INTERNAL
# @DESCRIPTION:
@@ -647,9 +597,12 @@
set -- distutils-r1_run_phase "${@}"
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
- _distutils-r1_multijob_init
- python_foreach_impl "${@}"
- _distutils-r1_multijob_finish
+ if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
+ then
+ python_foreach_impl "${@}"
+ else
+ python_parallel_foreach_impl "${@}"
+ fi
else
if [[ ! ${EPYTHON} ]]; then
die "EPYTHON unset, python-single-r1_pkg_setup not called?!"
1.47 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.46&r2=1.47
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- python-r1.eclass 4 Mar 2013 19:27:58 -0000 1.46
+++ python-r1.eclass 4 Mar 2013 19:28:47 -0000 1.47
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.46 2013/03/04 19:27:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.47 2013/03/04 19:28:47 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -173,6 +173,14 @@
}
_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:
@@ -634,6 +642,31 @@
multibuild_foreach_variant _python_multibuild_wrapper "${@}"
}
+# @FUNCTION: python_parallel_foreach_impl
+# @USAGE: <command> [<args>...]
+# @DESCRIPTION:
+# Run the given command for each of the enabled Python implementations.
+# If additional parameters are passed, they will be passed through
+# to the command.
+#
+# The function will return 0 status if all invocations succeed.
+# Otherwise, the return code from first failing invocation will
+# be returned.
+#
+# 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).
+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 "${@}"
+}
+
# @FUNCTION: python_export_best
# @USAGE: [<variable>...]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass
@ 2014-12-07 19:15 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-07 19:15 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/07 19:15:19
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
Log:
Disable parallel run support to make things easier for developers and more predictable for users.
Revision Changes Path
1.1455 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1455&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1455&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1454&r2=1.1455
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1454
retrieving revision 1.1455
diff -u -r1.1454 -r1.1455
--- ChangeLog 7 Dec 2014 07:23:12 -0000 1.1454
+++ ChangeLog 7 Dec 2014 19:15:18 -0000 1.1455
@@ -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.
1.104 eclass/distutils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.103&r2=1.104
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- distutils-r1.eclass 24 Nov 2014 01:39:55 -0000 1.103
+++ distutils-r1.eclass 7 Dec 2014 19:15:19 -0000 1.104
@@ -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 @@
# '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 @@
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 @@
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?!"
1.80 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.79&r2=1.80
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- python-r1.eclass 22 Nov 2014 02:38:21 -0000 1.79
+++ python-r1.eclass 7 Dec 2014 19:15:19 -0000 1.80
@@ -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
-# @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 @@
# 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass
@ 2014-12-28 10:56 Michal Gorny (mgorny)
0 siblings, 0 replies; 6+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-28 10:56 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/28 10:56:55
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
Log:
Verbosely deprecate python_parallel_foreach_impl and DISTUTILS_NO_PARALLEL_BUILD.
Revision Changes Path
1.1484 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1484&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1484&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1483&r2=1.1484
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1483
retrieving revision 1.1484
diff -u -r1.1483 -r1.1484
--- ChangeLog 28 Dec 2014 10:13:18 -0000 1.1483
+++ ChangeLog 28 Dec 2014 10:56:55 -0000 1.1484
@@ -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.1483 2014/12/28 10:13:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1484 2014/12/28 10:56:55 mgorny Exp $
+
+ 28 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
+ python-r1.eclass:
+ Verbosely deprecate python_parallel_foreach_impl and
+ DISTUTILS_NO_PARALLEL_BUILD.
28 Dec 2014; Hans de Graaff <graaff@gentoo.org> ruby-fakegem.eclass:
Add test recipe for rspec:3 slot.
1.108 eclass/distutils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.107&r2=1.108
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- distutils-r1.eclass 27 Dec 2014 19:00:10 -0000 1.107
+++ distutils-r1.eclass 28 Dec 2014 10:56:55 -0000 1.108
@@ -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.107 2014/12/27 19:00:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.108 2014/12/28 10:56:55 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -652,6 +652,13 @@
_distutils-r1_run_foreach_impl() {
debug-print-function ${FUNCNAME} "${@}"
+ if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+ eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
+ eqawarn "are non-parallel. Please remove it from the ebuild."
+
+ unset DISTUTILS_NO_PARALLEL_BUILD # avoid repeated warnings
+ fi
+
# store for restoring after distutils-r1_run_phase.
local _DISTUTILS_INITIAL_CWD=${PWD}
set -- distutils-r1_run_phase "${@}"
1.81 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.80&r2=1.81
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- python-r1.eclass 7 Dec 2014 19:15:19 -0000 1.80
+++ python-r1.eclass 28 Dec 2014 10:56:55 -0000 1.81
@@ -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.80 2014/12/07 19:15:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.81 2014/12/28 10:56:55 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -724,6 +724,13 @@
python_parallel_foreach_impl() {
debug-print-function ${FUNCNAME} "${@}"
+ if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
+ eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
+ eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."
+
+ _PYTHON_PARALLEL_WARNED=1
+ fi
+
local MULTIBUILD_VARIANTS
_python_obtain_impls
multibuild_foreach_variant _python_multibuild_wrapper "${@}"
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-12-28 10:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-15 15:01 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2012-12-16 23:26 Michal Gorny (mgorny)
2013-02-26 14:33 Michal Gorny (mgorny)
2013-03-04 19:28 Michal Gorny (mgorny)
2014-12-07 19:15 Michal Gorny (mgorny)
2014-12-28 10:56 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox