public inbox for gentoo-python@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-python@lists.gentoo.org
Cc: python@gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-python] [PATCH distutils-r1] Provide Python env in python_prepare_all().
Date: Sun, 27 Oct 2013 20:16:33 +0100	[thread overview]
Message-ID: <1382901393-27141-1-git-send-email-mgorny@gentoo.org> (raw)

Some of the ebuilds need that, and call 'python_export_best' explicitly
for that reason. It is better to handle it eclass-wide, and therefore
gain consistency with other _all() phases.
---
 eclass/distutils-r1.eclass | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 2b609b4..b3ffd13 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -655,12 +655,21 @@ distutils-r1_src_prepare() {
 
 	local _DISTUTILS_DEFAULT_CALLED
 
-	# common preparations
-	if declare -f python_prepare_all >/dev/null; then
-		python_prepare_all
-	else
-		distutils-r1_python_prepare_all
-	fi
+	_distutils-r1_run_prepare_all() {
+		# we need to keep those local to ensure that the best-impl
+		# setting doesn't leak through to per-impl phases
+		local -x EPYTHON PYTHON
+		local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
+		python_setup
+
+		# common preparations
+		if declare -f python_prepare_all >/dev/null; then
+			python_prepare_all
+		else
+			distutils-r1_python_prepare_all
+		fi
+	}
+	_distutils-r1_run_prepare_all
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
 		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
-- 
1.8.4



                 reply	other threads:[~2013-10-27 19:16 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1382901393-27141-1-git-send-email-mgorny@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=gentoo-python@lists.gentoo.org \
    --cc=python@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox