Mailing List Archive

[PATCH v2 6/7] meson.eclass: move python_export_utf8_locale to meson_src_configure
From: Sam James <sam@gentoo.org>

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>
---
eclass/meson.eclass | 6 +++---
1 file 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+=(
--
2.44.0