| 1 |
The separate init & finish call was needed before |
| 2 |
distutils-r1_run_foreach_impl() was introduced. Now it's simpler to call |
| 3 |
them both inside that function. |
| 4 |
--- |
| 5 |
gx86/eclass/distutils-r1.eclass | 12 ++---------- |
| 6 |
1 file changed, 2 insertions(+), 10 deletions(-) |
| 7 |
|
| 8 |
diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass |
| 9 |
index 8457fd2..adb5d42 100644 |
| 10 |
--- a/gx86/eclass/distutils-r1.eclass |
| 11 |
+++ b/gx86/eclass/distutils-r1.eclass |
| 12 |
@@ -610,7 +610,9 @@ _distutils-r1_run_foreach_impl() { |
| 13 |
set -- distutils-r1_run_phase "${@}" |
| 14 |
|
| 15 |
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then |
| 16 |
+ _distutils-r1_multijob_init |
| 17 |
python_foreach_impl "${@}" |
| 18 |
+ _distutils-r1_multijob_finish |
| 19 |
else |
| 20 |
if [[ ! ${EPYTHON} ]]; then |
| 21 |
die "EPYTHON unset, python-single-r1_pkg_setup not called?!" |
| 22 |
@@ -632,19 +634,15 @@ distutils-r1_src_prepare() { |
| 23 |
distutils-r1_python_prepare_all |
| 24 |
fi |
| 25 |
|
| 26 |
- _distutils-r1_multijob_init |
| 27 |
if declare -f python_prepare >/dev/null; then |
| 28 |
_distutils-r1_run_foreach_impl python_prepare |
| 29 |
fi |
| 30 |
- _distutils-r1_multijob_finish |
| 31 |
} |
| 32 |
|
| 33 |
distutils-r1_src_configure() { |
| 34 |
- _distutils-r1_multijob_init |
| 35 |
if declare -f python_configure >/dev/null; then |
| 36 |
_distutils-r1_run_foreach_impl python_configure |
| 37 |
fi |
| 38 |
- _distutils-r1_multijob_finish |
| 39 |
|
| 40 |
if declare -f python_configure_all >/dev/null; then |
| 41 |
_distutils-r1_run_common_phase python_configure_all |
| 42 |
@@ -654,13 +652,11 @@ distutils-r1_src_configure() { |
| 43 |
distutils-r1_src_compile() { |
| 44 |
debug-print-function ${FUNCNAME} "${@}" |
| 45 |
|
| 46 |
- _distutils-r1_multijob_init |
| 47 |
if declare -f python_compile >/dev/null; then |
| 48 |
_distutils-r1_run_foreach_impl python_compile |
| 49 |
else |
| 50 |
_distutils-r1_run_foreach_impl distutils-r1_python_compile |
| 51 |
fi |
| 52 |
- _distutils-r1_multijob_finish |
| 53 |
|
| 54 |
if declare -f python_compile_all >/dev/null; then |
| 55 |
_distutils-r1_run_common_phase python_compile_all |
| 56 |
@@ -670,11 +666,9 @@ distutils-r1_src_compile() { |
| 57 |
distutils-r1_src_test() { |
| 58 |
debug-print-function ${FUNCNAME} "${@}" |
| 59 |
|
| 60 |
- _distutils-r1_multijob_init |
| 61 |
if declare -f python_test >/dev/null; then |
| 62 |
_distutils-r1_run_foreach_impl python_test |
| 63 |
fi |
| 64 |
- _distutils-r1_multijob_finish |
| 65 |
|
| 66 |
if declare -f python_test_all >/dev/null; then |
| 67 |
_distutils-r1_run_common_phase python_test_all |
| 68 |
@@ -684,13 +678,11 @@ distutils-r1_src_test() { |
| 69 |
distutils-r1_src_install() { |
| 70 |
debug-print-function ${FUNCNAME} "${@}" |
| 71 |
|
| 72 |
- _distutils-r1_multijob_init |
| 73 |
if declare -f python_install >/dev/null; then |
| 74 |
_distutils-r1_run_foreach_impl python_install |
| 75 |
else |
| 76 |
_distutils-r1_run_foreach_impl distutils-r1_python_install |
| 77 |
fi |
| 78 |
- _distutils-r1_multijob_finish |
| 79 |
|
| 80 |
if declare -f python_install_all >/dev/null; then |
| 81 |
_distutils-r1_run_common_phase python_install_all |
| 82 |
-- |
| 83 |
1.8.1.2 |
Archives