| 1 |
commit: a87248476b3cf02116badc4efa1c8ddf3ad0b43a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 8 11:56:37 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 9 20:31:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8724847 |
| 7 |
|
| 8 |
distutils-r1.eclass: Move setup from src_configure to prepare_all |
| 9 |
|
| 10 |
Move a few minor setup calls from distutils-r1_src_configure() |
| 11 |
to distutils-r1_python_prepare_all(). Since we do not declare default |
| 12 |
configure sub-phases, it is easy to override src_configure() entirely |
| 13 |
and accidentally skip these steps. We already warn for missing |
| 14 |
distutils-r1_python_prepare_all() call, so let's move them there. |
| 15 |
|
| 16 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 17 |
|
| 18 |
eclass/distutils-r1.eclass | 6 +++--- |
| 19 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 22 |
index c2f5ab263cd5..17286070e712 100644 |
| 23 |
--- a/eclass/distutils-r1.eclass |
| 24 |
+++ b/eclass/distutils-r1.eclass |
| 25 |
@@ -985,7 +985,10 @@ distutils-r1_python_prepare_all() { |
| 26 |
python_copy_sources |
| 27 |
fi |
| 28 |
|
| 29 |
+ python_export_utf8_locale |
| 30 |
+ [[ ${EAPI} == 6 ]] && xdg_environment_reset # Bug 577704 |
| 31 |
_distutils-r1_print_package_versions |
| 32 |
+ |
| 33 |
_DISTUTILS_DEFAULT_CALLED=1 |
| 34 |
} |
| 35 |
|
| 36 |
@@ -1715,9 +1718,6 @@ distutils-r1_src_configure() { |
| 37 |
debug-print-function ${FUNCNAME} "${@}" |
| 38 |
local ret=0 |
| 39 |
|
| 40 |
- python_export_utf8_locale |
| 41 |
- [[ ${EAPI} == 6 ]] && xdg_environment_reset # Bug 577704 |
| 42 |
- |
| 43 |
if declare -f python_configure >/dev/null; then |
| 44 |
_distutils-r1_run_foreach_impl python_configure || ret=${?} |
| 45 |
fi |
Archives