Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 16 Jan 2022 17:41:00
Message-Id: 1642354849.d1cffb5e0c1d470cf472e1d008b0b1f4861a5f65.mgorny@gentoo
1 commit: d1cffb5e0c1d470cf472e1d008b0b1f4861a5f65
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 13 10:57:07 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 16 17:40:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1cffb5e
7
8 distutils-r1.eclass: Force stdlib distutils for the time being
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/distutils-r1.eclass | 4 ++++
13 1 file changed, 4 insertions(+)
14
15 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
16 index 074a611c84dd..85e94bd569e4 100644
17 --- a/eclass/distutils-r1.eclass
18 +++ b/eclass/distutils-r1.eclass
19 @@ -1033,6 +1033,10 @@ distutils-r1_run_phase() {
20
21 local -x LDSHARED="${CC} ${ldopts}" LDCXXSHARED="${CXX} ${ldopts}"
22
23 + # Undo the default switch in setuptools-60+ for the time being,
24 + # to avoid replacing .egg-info file with directory in-place.
25 + local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}"
26 +
27 "${@}"
28
29 cd "${_DISTUTILS_INITIAL_CWD}" || die