1 |
--- |
2 |
gx86/eclass/distutils-r1.eclass | 25 ++++--------------------- |
3 |
1 file changed, 4 insertions(+), 21 deletions(-) |
4 |
|
5 |
diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass |
6 |
index 40dae36..ba48a35 100644 |
7 |
--- a/gx86/eclass/distutils-r1.eclass |
8 |
+++ b/gx86/eclass/distutils-r1.eclass |
9 |
@@ -549,11 +549,6 @@ distutils-r1_run_phase() { |
10 |
then |
11 |
popd >/dev/null || die |
12 |
fi |
13 |
- |
14 |
- # Store them for reuse. |
15 |
- _DISTUTILS_BEST_IMPL=( |
16 |
- "${EPYTHON}" "${PYTHON}" "${BUILD_DIR}" "${PYTHONPATH}" |
17 |
- ) |
18 |
} |
19 |
|
20 |
# @FUNCTION: _distutils-r1_run_common_phase |
21 |
@@ -567,23 +562,11 @@ distutils-r1_run_phase() { |
22 |
_distutils-r1_run_common_phase() { |
23 |
local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR} |
24 |
|
25 |
- local EPYTHON=${_DISTUTILS_BEST_IMPL[0]} |
26 |
- local PYTHON=${_DISTUTILS_BEST_IMPL[1]} |
27 |
- local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]} |
28 |
- local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]} |
29 |
- |
30 |
- export EPYTHON PYTHON PYTHONPATH |
31 |
- |
32 |
- if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then |
33 |
- pushd "${BUILD_DIR}"/.. >/dev/null || die |
34 |
- fi |
35 |
+ local MULTIBUILD_VARIANTS |
36 |
+ _python_obtain_impls |
37 |
|
38 |
- einfo "common: running ${1}" |
39 |
- "${@}" |
40 |
- |
41 |
- if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then |
42 |
- popd >/dev/null || die |
43 |
- fi |
44 |
+ multibuild_for_best_variant _python_multibuild_wrapper \ |
45 |
+ distutils-r1_run_phase "${@}" |
46 |
} |
47 |
|
48 |
# @FUNCTION: _distutils-r1_run_foreach_impl |
49 |
-- |
50 |
1.8.1.4 |