Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH] distutils-r1.eclass: Force stdlib distutils for the time being
Date: Thu, 13 Jan 2022 10:57:34
Message-Id: 20220113105722.1149122-1-mgorny@gentoo.org
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/distutils-r1.eclass | 4 ++++
4 1 file changed, 4 insertions(+)
5
6 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
7 index 7bd9baba8167..0f0b8b1c28f4 100644
8 --- a/eclass/distutils-r1.eclass
9 +++ b/eclass/distutils-r1.eclass
10 @@ -1021,6 +1021,10 @@ distutils-r1_run_phase() {
11
12 local -x LDSHARED="${CC} ${ldopts}" LDCXXSHARED="${CXX} ${ldopts}"
13
14 + # Undo the default switch in setuptools-60+ for the time being,
15 + # to avoid replacing .egg-info file with directory in-place.
16 + local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}"
17 +
18 "${@}"
19
20 cd "${_DISTUTILS_INITIAL_CWD}" || die
21 --
22 2.34.1