[gentoo-python] [PATCH] Export best implementation build dir as BUILD_DIR in common phases.

[gentoo-python] [PATCH] Export best implementation build dir as BUILD_DIR in common phases.

[Michał Górny]

This is more friendly than BEST_BUILD_DIR and should not cause trouble
in the common cases.
---
 gx86/eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
index 8156a36..9d6c714 100644
--- a/gx86/eclass/distutils-r1.eclass
+++ b/gx86/eclass/distutils-r1.eclass
@@ -450,9 +450,11 @@ distutils-r1_run_phase() {
 # @DESCRIPTION:
 # Run the given command, restoring the best-implementation state.
 _distutils-r1_run_common_phase() {
+	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
+
 	local EPYTHON=${_DISTUTILS_BEST_IMPL[0]}
 	local PYTHON=${_DISTUTILS_BEST_IMPL[1]}
-	local BEST_BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
+	local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
 	local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]}
 
 	export EPYTHON PYTHON PYTHONPATH
-- 
1.8.1

[gentoo-python] Re: [PATCH] Export best implementation build dir as BUILD_DIR in common phases.

[Mike Gilbert]

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

On 01/12/2013 01:52 PM, Michał Górny wrote:
> This is more friendly than BEST_BUILD_DIR and should not cause trouble
> in the common cases.
> ---
>  gx86/eclass/distutils-r1.eclass | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
> index 8156a36..9d6c714 100644
> --- a/gx86/eclass/distutils-r1.eclass
> +++ b/gx86/eclass/distutils-r1.eclass
> @@ -450,9 +450,11 @@ distutils-r1_run_phase() {
>  # @DESCRIPTION:
>  # Run the given command, restoring the best-implementation state.
>  _distutils-r1_run_common_phase() {
> +	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
> +
>  	local EPYTHON=${_DISTUTILS_BEST_IMPL[0]}
>  	local PYTHON=${_DISTUTILS_BEST_IMPL[1]}
> -	local BEST_BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
> +	local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
>  	local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]}
>  
>  	export EPYTHON PYTHON PYTHONPATH
> 

I never really understood the point of BEST_BUILD_DIR anyway. Did
anything ever use it?

The change seems ok.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 230 bytes --]

Re: [gentoo-python] Re: [PATCH] Export best implementation build dir as BUILD_DIR in common phases.

[Michał Górny]

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

On Sat, 12 Jan 2013 14:04:28 -0500
Mike Gilbert <floppym@gentoo.org> wrote:

> On 01/12/2013 01:52 PM, Michał Górny wrote:
> > This is more friendly than BEST_BUILD_DIR and should not cause trouble
> > in the common cases.
> > ---
> >  gx86/eclass/distutils-r1.eclass | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
> > index 8156a36..9d6c714 100644
> > --- a/gx86/eclass/distutils-r1.eclass
> > +++ b/gx86/eclass/distutils-r1.eclass
> > @@ -450,9 +450,11 @@ distutils-r1_run_phase() {
> >  # @DESCRIPTION:
> >  # Run the given command, restoring the best-implementation state.
> >  _distutils-r1_run_common_phase() {
> > +	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
> > +
> >  	local EPYTHON=${_DISTUTILS_BEST_IMPL[0]}
> >  	local PYTHON=${_DISTUTILS_BEST_IMPL[1]}
> > -	local BEST_BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
> > +	local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
> >  	local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]}
> >  
> >  	export EPYTHON PYTHON PYTHONPATH
> > 
> 
> I never really understood the point of BEST_BUILD_DIR anyway. Did
> anything ever use it?

Well, the one ebuild that needed distutils BUILD_DIR.

The major issue is that BUILD_DIR is used in python_foreach_impl to
construct implementation-specific BUILD_DIRs. It's an unlikely scenario
but it will be a bit broken if anything in python_*_all() used
python_foreach_impl() and BUILD_DIR set by it.

-- 
Best regards,
Michał Górny

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