termux_setup_python_crossenv: Fix PYTHONPATH

in cross-python.
This commit is contained in:
Tee KOBAYASHI 2022-10-26 03:31:51 +09:00 committed by xtkoba
parent 9389668df1
commit d968da9f13
1 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,22 @@
--- a/crossenv/__init__.py
+++ b/crossenv/__init__.py
@@ -695,6 +695,8 @@
# Also: 'stdlib' might not be accurate if build-python is in a build
# directory.
stdlib = os.path.abspath(os.path.dirname(os.__file__))
+ stdlib_dynload = os.path.join(stdlib, 'lib-dynload')
+ build_site_dir = os.path.join(context.build_env_dir, 'lib', pyver, 'site-packages')
context.sentinel = random.randint(0,0xffffffff)
--- a/crossenv/scripts/pywrapper.py.tmpl
+++ b/crossenv/scripts/pywrapper.py.tmpl
@@ -17,7 +17,7 @@
os.environ['_PYTHON_SYSCONFIGDATA_NAME']={{repr(sysconfig_name)}}
os.environ['PYTHONHOME']={{repr(self.host_home)}}
oldpath = os.environ.get('PYTHONPATH')
-newpath = os.pathsep.join([{{repr(context.lib_path)}}, {{repr(stdlib)}}])
+newpath = os.pathsep.join([{{repr(context.lib_path)}}, {{repr(build_site_dir)}}, {{repr(stdlib)}}, {{repr(stdlib_dynload)}}])
if oldpath:
path = os.pathsep.join([newpath, oldpath])
else: