fix PYTHONPATH hacks

Author: T-Dynamos

pythonforandroid/build.py

@@ -728,10 +728,6 @@ def process_python_modules(ctx, modules, arch):
     host_recipe = None
     try:
         host_recipe = Recipe.get_recipe("hostpython3", ctx)
-        _python_path = host_recipe.get_path_to_python()
-        libdir = glob.glob(join(_python_path, "build", "lib*"))
-        env['PYTHONPATH'] = host_recipe.site_dir + ":" + join(
-            _python_path, "Modules") + ":" + (libdir[0] if libdir else "")
         pip = host_recipe.pip
     except Exception:
         # hostpython3 is unavailable, so fall back to system pip

pythonforandroid/recipe.py

@@ -1031,10 +1031,8 @@ def install_python_package(self, arch, name=None, env=None, is_dir=True):
 
     def get_hostrecipe_env(self, arch=None):
         env = environ.copy()
-        _python_path = self._host_recipe.get_path_to_python()
-        libdir = glob.glob(join(_python_path, "build", "lib*"))
-        env['PYTHONPATH'] = self._host_recipe.site_dir + ":" + join(
-            _python_path, "Modules") + ":" + (libdir[0] if libdir else "")
+        env['PYTHONPATH'] = ''
+        env['HOME'] = '/tmp'
         return env
 
     @property
@@ -1063,14 +1061,9 @@ def install_hostpython_prerequisites(self, packages=None, force_upgrade=True):
         pip_options = [
             "install",
             *packages,
-            "--target", self._host_recipe.site_dir, "--python-version",
-            self.ctx.python_recipe.version,
-            # Don't use sources, instead wheels
-            "--only-binary=:all:",
         ]
         if force_upgrade:
             pip_options.append("--upgrade")
-        # Use system's pip
         pip_env = self.get_hostrecipe_env()
         shprint(self._host_recipe.pip, *pip_options, _env=pip_env)
 
@@ -1397,8 +1390,6 @@ def build_arch(self, arch):
         # make build dir separately
         sub_build_dir = join(build_dir, "p4a_android_build")
         ensure_dir(sub_build_dir)
-        # copy hostpython to built python to ensure correct selection of libs and includes
-        shprint(sh.cp, self.real_hostpython_location, self.ctx.python_recipe.python_exe)
 
         build_args = [
             "-m",
@@ -1411,7 +1402,7 @@ def build_arch(self, arch):
         built_wheels = []
         with current_directory(build_dir):
             shprint(
-                sh.Command(self.ctx.python_recipe.python_exe), *build_args, _env=env
+                sh.Command(self.real_hostpython_location), *build_args, _env=env
             )
             built_wheels = [realpath(whl) for whl in glob.glob("dist/*.whl")]
         self.install_wheel(arch, built_wheels)
@@ -1523,8 +1514,6 @@ class RustCompiledComponentsRecipe(PyProjectRecipe):
         "x86": "i686-linux-android",
     }
 
-    call_hostpython_via_targetpython = False
-
     def get_recipe_env(self, arch, **kwargs):
         env = super().get_recipe_env(arch, **kwargs)
 

pythonforandroid/recipes/hostpython3/__init__.py

@@ -69,7 +69,7 @@ def _exe_name(self):
     @property
     def python_exe(self):
         '''Returns the full path of the hostpython executable.'''
-        return join(self.get_path_to_python(), self._exe_name)
+        return join(self.local_bin, self._exe_name)
 
     def get_recipe_env(self, arch=None):
         env = os.environ.copy()
@@ -112,9 +112,13 @@ def site_root(self):
     def site_bin(self):
         return join(self.site_root, self.site_dir, "bin")
 
+    @property
+    def local_dir(self):
+        return join(self.site_root, "usr/local/")
+
     @property
     def local_bin(self):
-        return join(self.site_root, "usr/local/bin/")
+        return join(self.local_dir, "bin")
 
     @property
     def site_dir(self):
@@ -164,7 +168,8 @@ def build_arch(self, arch):
         build_configured = False
         with current_directory(build_dir):
             if not Path('config.status').exists():
-                shprint(sh.Command(join(recipe_build_dir, 'configure')), _env=env)
+                shprint(sh.Command(join(recipe_build_dir, 'configure')),
+                        '--prefix', self.local_dir, _env=env)
                 build_configured = True
 
         with current_directory(recipe_build_dir):
@@ -184,7 +189,7 @@ def build_arch(self, arch):
                     )
 
             shprint(sh.make, '-j', str(cpu_count()), '-C', build_dir, _env=env)
-
+            shprint(sh.make, 'install', _env=env)
             # make a copy of the python executable giving it the name we want,
             # because we got different python's executable names depending on
             # the fs being case-insensitive (Mac OS X, Cygwin...) or
@@ -200,9 +205,8 @@ def build_arch(self, arch):
         self.ctx.hostpython = self.python_exe
 
         if build_configured:
-
             shprint(
-                sh.Command(self.python_exe), "-m", "ensurepip", "--root", self.site_root, "-U",
+                sh.Command(self.python_exe), "-m", "ensurepip", "-U",
                 _env={"HOME": "/tmp", "PATH": self.local_bin}
             )
             self.fix_pip_shebangs()