diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2022-05-08 13:56:37 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2022-05-09 22:31:53 +0200 |
| commit | a87248476b3cf02116badc4efa1c8ddf3ad0b43a (patch) | |
| tree | 00f7453ad2b0a4a6def099562a9dc3d5969e03a6 /eclass | |
| parent | distutils-r1.eclass: Print buildsys package versions to aid debug (diff) | |
| download | gentoo-a87248476b3cf02116badc4efa1c8ddf3ad0b43a.tar.gz gentoo-a87248476b3cf02116badc4efa1c8ddf3ad0b43a.tar.bz2 gentoo-a87248476b3cf02116badc4efa1c8ddf3ad0b43a.zip | |
distutils-r1.eclass: Move setup from src_configure to prepare_all
Move a few minor setup calls from distutils-r1_src_configure()
to distutils-r1_python_prepare_all(). Since we do not declare default
configure sub-phases, it is easy to override src_configure() entirely
and accidentally skip these steps. We already warn for missing
distutils-r1_python_prepare_all() call, so let's move them there.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index c2f5ab263cd5..17286070e712 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -985,7 +985,10 @@ distutils-r1_python_prepare_all() { python_copy_sources fi + python_export_utf8_locale + [[ ${EAPI} == 6 ]] && xdg_environment_reset # Bug 577704 _distutils-r1_print_package_versions + _DISTUTILS_DEFAULT_CALLED=1 } @@ -1715,9 +1718,6 @@ distutils-r1_src_configure() { debug-print-function ${FUNCNAME} "${@}" local ret=0 - python_export_utf8_locale - [[ ${EAPI} == 6 ]] && xdg_environment_reset # Bug 577704 - if declare -f python_configure >/dev/null; then _distutils-r1_run_foreach_impl python_configure || ret=${?} fi |