1 |
commit: 97fd212c9dbfac164d1ec26757b276dfb11765ec |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 29 07:31:50 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 29 07:53:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97fd212c |
7 |
|
8 |
distutils-r1.eclass: Do not create ${BUILD_DIR}/lib in PEP 517 mode |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
eclass/distutils-r1.eclass | 16 ++++++++-------- |
13 |
1 file changed, 8 insertions(+), 8 deletions(-) |
14 |
|
15 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
16 |
index a5500df86937..8d03d2d1771d 100644 |
17 |
--- a/eclass/distutils-r1.eclass |
18 |
+++ b/eclass/distutils-r1.eclass |
19 |
@@ -1289,15 +1289,15 @@ distutils-r1_run_phase() { |
20 |
# Undo the default switch in setuptools-60+ for the time being, |
21 |
# to avoid replacing .egg-info file with directory in-place. |
22 |
local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}" |
23 |
- fi |
24 |
|
25 |
- # Bug 559644 |
26 |
- # using PYTHONPATH when the ${BUILD_DIR}/lib is not created yet might lead to |
27 |
- # problems in setup.py scripts that try to import modules/packages from that path |
28 |
- # during the build process (Python at startup evaluates PYTHONPATH, if the dir is |
29 |
- # not valid then associates a NullImporter object to ${BUILD_DIR}/lib storing it |
30 |
- # in the sys.path_importer_cache) |
31 |
- mkdir -p "${BUILD_DIR}/lib" || die |
32 |
+ # Bug 559644 |
33 |
+ # using PYTHONPATH when the ${BUILD_DIR}/lib is not created yet might lead to |
34 |
+ # problems in setup.py scripts that try to import modules/packages from that path |
35 |
+ # during the build process (Python at startup evaluates PYTHONPATH, if the dir is |
36 |
+ # not valid then associates a NullImporter object to ${BUILD_DIR}/lib storing it |
37 |
+ # in the sys.path_importer_cache) |
38 |
+ mkdir -p "${BUILD_DIR}/lib" || die |
39 |
+ fi |
40 |
|
41 |
# Set up build environment, bug #513664. |
42 |
local -x AR=${AR} CC=${CC} CPP=${CPP} CXX=${CXX} |