diff options
| author |   Sam James <sam@gentoo.org> | 2024-03-03 06:42:38 +0000 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2024-03-08 06:40:23 +0100 |
| commit | 59c3eabf79595f15b091a64d649ca865441ce05d (patch) | |
| tree | 70feb73ff9694a9e3a96d6799d2339517c421bba /eclass | |
| parent | python-utils-r1.eclass: Fix python_doheader install location with ROOT (diff) | |
| download | gentoo-59c3eabf79595f15b091a64d649ca865441ce05d.tar.gz gentoo-59c3eabf79595f15b091a64d649ca865441ce05d.tar.bz2 gentoo-59c3eabf79595f15b091a64d649ca865441ce05d.zip | |
meson.eclass: move python_export_utf8_locale to meson_src_configure
We don't need it in setup_meson_src_configure as distutils-r1 uses it and
it'll get called twice then.
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/meson.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 3bf0ba9ebe97..85f024de1b0c 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -393,9 +393,6 @@ setup_meson_src_configure() { tc-export NM tc-getPROG READELF readelf >/dev/null - # https://bugs.gentoo.org/625396 - python_export_utf8_locale - # https://bugs.gentoo.org/721786 export BOOST_INCLUDEDIR="${BOOST_INCLUDEDIR-${EPREFIX}/usr/include}" export BOOST_LIBRARYDIR="${BOOST_LIBRARYDIR-${EPREFIX}/usr/$(get_libdir)}" @@ -412,6 +409,9 @@ meson_src_configure() { BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}" + # https://bugs.gentoo.org/625396 + python_export_utf8_locale + ( setup_meson_src_configure "$@" MESONARGS+=( |