Re: [gentoo-python] Re: [PATCH] Support overriding job-count for distutils-r1 multiprocessing.

["Michał Górny" <mgorny@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 4419 bytes --]

On Tue, 1 Jan 2013 14:15:35 -0500
Mike Gilbert <floppym@gentoo.org> wrote:

> On Tue, Jan 1, 2013 at 11:57 AM, Michał Górny <mgorny@gentoo.org> wrote:
> > ---
> >  gx86/eclass/distutils-r1.eclass | 44 ++++++++++++++++++++++++++++-------------
> >  1 file changed, 30 insertions(+), 14 deletions(-)
> >
> > diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
> > index e288c2c..3312505 100644
> > --- a/gx86/eclass/distutils-r1.eclass
> > +++ b/gx86/eclass/distutils-r1.eclass
> > @@ -68,6 +68,14 @@ if [[ ! ${_DISTUTILS_R1} ]]; then
> >  RDEPEND=${PYTHON_DEPS}
> >  DEPEND=${PYTHON_DEPS}
> >
> > +# @ECLASS-VARIABLE: DISTUTILS_JOBS
> > +# @DEFAULT_UNSET
> > +# @DECRIPTION:
> > +# 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:
> > @@ -144,15 +152,6 @@ DEPEND=${PYTHON_DEPS}
> >  # This variable can be used to disable the afore-mentioned feature
> >  # in case it causes issues with the package.
> >
> > -#
> > -# If in-source builds are used, the eclass will create a copy of package
> > -# sources for each Python implementation in python_prepare_all(),
> > -# and work on that copy afterwards.
> > -#
> > -# If out-of-source builds are used, the eclass will instead work
> > -# on the sources directly, prepending setup.py arguments with
> > -# 'build --build-base ${BUILD_DIR}' to enforce keeping & using built
> > -# files in the specific root.
> >  # @ECLASS-VARIABLE: mydistutilsargs
> >  # @DEFAULT_UNSET
> >  # @DESCRIPTION:
> > @@ -425,6 +424,23 @@ _distutils-r1_run_common_phase() {
> >         "${@}"
> >  }
> >
> > +# @FUNCTION: _distutils-r1_multijob_init
> > +# @INTERNAL
> > +# @DESCRIPTION:
> > +# Init multijob, taking the job-count from ${DISTUTILS_JOBS}.
> > +_distutils-r1_multijob_init() {
> > +       debug-print-function ${FUNCNAME} "${@}"
> > +
> > +       local opts
> > +       if [[ ${DISTUTILS_JOBS} ]]; then
> > +               opts=-j${DISTUTILS_JOBS}
> > +       else
> > +               opts=${MAKEOPTS}
> > +       fi
> > +
> > +       multijob_init "${opts}"
> > +}
> > +
> >  distutils-r1_src_prepare() {
> >         debug-print-function ${FUNCNAME} "${@}"
> >
> > @@ -435,7 +451,7 @@ distutils-r1_src_prepare() {
> >                 distutils-r1_python_prepare_all
> >         fi
> >
> > -       multijob_init
> > +       _distutils-r1_multijob_init
> >         if declare -f python_prepare >/dev/null; then
> >                 python_foreach_impl distutils-r1_run_phase python_prepare
> >         else
> > @@ -445,7 +461,7 @@ distutils-r1_src_prepare() {
> >  }
> >
> >  distutils-r1_src_configure() {
> > -       multijob_init
> > +       _distutils-r1_multijob_init
> >         if declare -f python_configure >/dev/null; then
> >                 python_foreach_impl distutils-r1_run_phase python_configure
> >         else
> > @@ -461,7 +477,7 @@ distutils-r1_src_configure() {
> >  distutils-r1_src_compile() {
> >         debug-print-function ${FUNCNAME} "${@}"
> >
> > -       multijob_init
> > +       _distutils-r1_multijob_init
> >         if declare -f python_compile >/dev/null; then
> >                 python_foreach_impl distutils-r1_run_phase python_compile
> >         else
> > @@ -477,7 +493,7 @@ distutils-r1_src_compile() {
> >  distutils-r1_src_test() {
> >         debug-print-function ${FUNCNAME} "${@}"
> >
> > -       multijob_init
> > +       _distutils-r1_multijob_init
> >         if declare -f python_test >/dev/null; then
> >                 python_foreach_impl distutils-r1_run_phase python_test
> >         else
> > @@ -493,7 +509,7 @@ distutils-r1_src_test() {
> >  distutils-r1_src_install() {
> >         debug-print-function ${FUNCNAME} "${@}"
> >
> > -       multijob_init
> > +       _distutils-r1_multijob_init
> >         if declare -f python_install >/dev/null; then
> >                 python_foreach_impl distutils-r1_run_phase python_install
> >         else
> > --
> > 1.8.0.2
> >
> 
> Seems ok. Was this requested by someone?

By me ;).

I have MAKEOPTS=-j6 because of distcc, and it kills my system with
nose's tests.

-- 
Best regards,
Michał Górny

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 316 bytes --]