From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 1/7] distutils-r1.eclass: Do not force stdlib distutils on py3.12+
Date: Fri, 2 Jun 2023 15:58:23 +0200 [thread overview]
Message-ID: <20230602135930.144301-2-mgorny@gentoo.org> (raw)
In-Reply-To: <20230602135930.144301-1-mgorny@gentoo.org>
Do not force SETUPTOOLS_USE_DISTUTILS=stdlib on Python 3.12+
(in non-PEP517 mode), as stdlib no longer supplies distutils there.
Thanks to Sam for the report!
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
eclass/distutils-r1.eclass | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 0ccd59fb6c78..f3325d5bd8f4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1814,9 +1814,11 @@ distutils-r1_run_phase() {
# and _all() already localizes it
local -x PATH=${PATH}
- # Undo the default switch in setuptools-60+ for the time being,
- # to avoid replacing .egg-info file with directory in-place.
- local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}"
+ if _python_impl_matches "${EPYTHON}" 3.{9..11}; then
+ # Undo the default switch in setuptools-60+ for the time being,
+ # to avoid replacing .egg-info file with directory in-place.
+ local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}"
+ fi
# Bug 559644
# using PYTHONPATH when the ${BUILD_DIR}/lib is not created yet might lead to
--
2.41.0
next prev parent reply other threads:[~2023-06-02 14:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 13:58 [gentoo-dev] [PATCH 0/7] distutils-r1.eclass: py3.12+ non-PEP517 fix, pdm-backend support and deprecated logic cleanup Michał Górny
2023-06-02 13:58 ` Michał Górny [this message]
2023-06-02 13:58 ` [gentoo-dev] [PATCH 2/7] dev-python/pycairo: Enable py3.12 Michał Górny
2023-06-02 13:58 ` [gentoo-dev] [PATCH 3/7] distutils-r1.eclass: Remove support for old maturin Michał Górny
2023-06-02 13:58 ` [gentoo-dev] [PATCH 4/7] distutils-r1.eclass: Remove support for old meson-python Michał Górny
2023-06-02 13:58 ` [gentoo-dev] [PATCH 5/7] dev-python/pdm-backend: Rename of dev-python/pdm-pep517, 2.0.7 Michał Górny
2023-06-02 13:58 ` [gentoo-dev] [PATCH 6/7] distutils-r1.eclass: Add support for pdm-backend Michał Górny
2023-06-02 13:58 ` [gentoo-dev] [PATCH 7/7] dev-python/atpublic: Bump to 3.1.2 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230602135930.144301-2-mgorny@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox