2445fe9fb2
* Removed patches:
* 001-enable-zlib.patch: zlib module should be enabled automatically
* 007-distutils-do-not-adjust-path.patch: Not necessary since we
process shebang lines for all scripts (in python3-package.mk)
* 030-bpo-43112-detect-musl-as-a-separate-SOABI-GH-24502.patch:
Already merged
* Move configure vars from config.site back into Makefile
Centralizing all build information into one file makes it easier to
maintain
* No longer set ac_cv_header_uuid_h=yes as configure should detect
libuuid
* Order configure args by enable-/disable-/with-/without-, then
alphabetically
* Set ac_cv_working_openssl_hashlib=yes for host configure to bypass the
OpenSSL API tests with LibreSSL
* Use the default Host/Compile recipe instead of picking out specific
targets to make
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
29 lines
1.5 KiB
Diff
29 lines
1.5 KiB
Diff
diff --git a/pip/_vendor/pep517/in_process/__init__.py b/pip/_vendor/pep517/in_process/__init__.py
|
|
index 281a356cfe26..77acbfc2670b 100644
|
|
--- a/pip/_vendor/pep517/in_process/__init__.py
|
|
+++ b/pip/_vendor/pep517/in_process/__init__.py
|
|
@@ -14,13 +14,21 @@ try:
|
|
except AttributeError:
|
|
# Python 3.8 compatibility
|
|
def _in_proc_script_path():
|
|
- return resources.path(__package__, '_in_process.py')
|
|
+ if resources.is_resource(__package__, '_in_process.py'):
|
|
+ return resources.path(__package__, '_in_process.py')
|
|
+ return resources.path(__package__, '_in_process.pyc')
|
|
else:
|
|
def _in_proc_script_path():
|
|
+ if resources.files(__package__).joinpath('_in_process.py').is_file():
|
|
+ return resources.as_file(
|
|
+ resources.files(__package__).joinpath('_in_process.py'))
|
|
return resources.as_file(
|
|
- resources.files(__package__).joinpath('_in_process.py'))
|
|
+ resources.files(__package__).joinpath('_in_process.pyc'))
|
|
except ImportError:
|
|
# Python 3.6 compatibility
|
|
@contextmanager
|
|
def _in_proc_script_path():
|
|
- yield pjoin(dirname(abspath(__file__)), '_in_process.py')
|
|
+ _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.py')
|
|
+ if not os.path.isfile(_in_proc_script):
|
|
+ _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.pyc')
|
|
+ yield _in_proc_script
|