fix numpy build

Author: T-Dynamos

pythonforandroid/meson_python.py

@@ -0,0 +1,76 @@
+import sys
+import json
+import subprocess
+import importlib.util
+from os.path import join
+from glob import glob
+
+
+class C:
+    TARGET_PYTHON_PREFIX = globals().get("TARGET_PYTHON_PREFIX")
+    PYTHON_MAJOR_VERSION = globals().get("PYTHON_MAJOR_VERSION", sys.version_info.major)
+    PYTHON_MINOR_VERSION = globals().get("PYTHON_MINOR_VERSION", sys.version_info.minor)
+    PLATFORM_TAG = globals().get("PLATFORM_TAG", sys.platform)
+    PYTHON_SUFFIX = globals().get("PYTHON_SUFFIX", "")
+
+
+def handle_python_info():
+
+    prefix = C.TARGET_PYTHON_PREFIX
+
+    sysconfig_file = glob(join(prefix, "lib/python3.14/_sysconfigdata*.py"))[0]
+
+    spec = importlib.util.spec_from_file_location("_android_cfg", sysconfig_file)
+    cfg = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(cfg)
+
+    ver_python = f"python{C.PYTHON_MAJOR_VERSION}.{C.PYTHON_MINOR_VERSION}"
+
+    site_path = join(prefix, f"lib/{ver_python}/site-packages")
+
+    android_paths = {
+        "stdlib": join(prefix, "lib"),
+        "platstdlib": join(prefix, "lib"),
+        "purelib": site_path,
+        "platlib": site_path,
+        "include": join(prefix, f"include/{ver_python}/"),
+        "platinclude": join(prefix, f"include/{ver_python}/"),
+        "scripts": join(prefix, "bin"),
+        "data": prefix,
+    }
+
+    print(
+        json.dumps(
+            {
+                "variables": cfg.build_time_vars,
+                "paths": android_paths,
+                "sysconfig_paths": android_paths,
+                "install_paths": android_paths,
+                "version": f"{C.PYTHON_MAJOR_VERSION}.{C.PYTHON_MINOR_VERSION}",
+                "platform": C.PLATFORM_TAG,
+                "is_pypy": False,
+                "is_venv": False,
+                "link_libpython": True,
+                "suffix": C.PYTHON_SUFFIX,
+                "limited_api_suffix": ".abi3.so",
+                "is_freethreaded": False,
+            }
+        )
+    )
+
+
+WHITELIST = {
+    "python_info.py": handle_python_info,
+}
+
+
+args = sys.argv[1:]
+
+if args:
+    cmd = args[0]
+    name = cmd.split("/")[-1]
+
+    if name in WHITELIST:
+        sys.exit(WHITELIST[name]())
+
+sys.exit(subprocess.run([sys.executable] + args).returncode)

pythonforandroid/recipe.py

@@ -10,8 +10,9 @@
 import zipfile
 import urllib.request
 from urllib.request import urlretrieve
-from os import listdir, unlink, environ, curdir, walk
+from os import listdir, unlink, environ, curdir, walk, chmod
 from sys import stdout
+from packaging.version import Version
 from multiprocessing import cpu_count
 import time
 try:
@@ -1058,6 +1059,7 @@ def install_hostpython_prerequisites(self, packages=None, force_upgrade=True):
         pip_options = [
             "install",
             *packages,
+            "-q",
         ]
         if force_upgrade:
             pip_options.append("--upgrade")
@@ -1303,6 +1305,8 @@ def get_recipe_env(self, arch, **kwargs):
             file.close()
 
         env["DIST_EXTRA_CONFIG"] = build_opts
+        python_recipe = Recipe.get_recipe("python3", self.ctx)
+        env["INCLUDEPY"] = python_recipe.include_root(arch.arch)
         return env
 
     @staticmethod
@@ -1374,7 +1378,6 @@ def build_arch(self, arch):
         if not (isfile(join(build_dir, "pyproject.toml")) or isfile(join(build_dir, "setup.py"))):
             warning("Skipping build because it does not appear to be a Python project.")
             return
-
         self.install_hostpython_prerequisites(
             packages=["build[virtualenv]", "pip", "setuptools", "patchelf"] + self.hostpython_prerequisites
         )
@@ -1405,7 +1408,6 @@ class MesonRecipe(PyProjectRecipe):
     '''Recipe for projects which uses meson as build system'''
 
     meson_version = "1.4.0"
-    ninja_version = "1.11.1.1"
 
     skip_python = False
     '''If true, skips all Python build and installation steps.
@@ -1414,10 +1416,55 @@ class MesonRecipe(PyProjectRecipe):
     def sanitize_flags(self, *flag_strings):
         return " ".join(flag_strings).strip().split(" ")
 
+    def get_python_wrapper(self, arch):
+        """
+        Meson Python introspection runs on the host interpreter, but the
+        target Python (Android) cannot be executed on the build machine.
+
+        We therefore run host Python and override sysconfig data to emulate
+        the target Android Python environment during Meson introspection.
+        """
+        python_recipe = Recipe.get_recipe('python3', self.ctx)
+        target_prefix = python_recipe.get_python_root(arch)
+        python_file = join(self.ctx.root_dir, 'meson_python.py')
+        _arch = {
+            "arm64-v8a": ["aarch64"],
+            "x86_64": ["x86_64"],
+            "armeabi-v7a": ["arm"],
+            "x86": ["i686"],
+        }[arch.arch][0]
+
+        # Real values pulled from android
+        # PYTHON_MAJOR_VERSION -> 3
+        # PYTHON_MINOR_VERSION -> 14
+        # PLATFORM_TAG eg -> 'android-24-arm64_v8a'
+        # PYTHON_SUFFIX eg -> '.cpython-314-aarch64-linux-android.so'
+
+        _p_version = Version(python_recipe.version)
+        file_data = f"#!{self.real_hostpython_location}"
+        file_data += f"\nTARGET_PYTHON_PREFIX='{target_prefix}'"
+        file_data += f"\nPYTHON_MAJOR_VERSION='{_p_version.major}'"
+        file_data += f"\nPYTHON_MINOR_VERSION='{_p_version.minor}'"
+        file_data += f"\nPLATFORM_TAG='{self.get_wheel_platform_tags(arch.arch, self.ctx)[0]}'"
+        file_data += f"\nPYTHON_SUFFIX='.cpython-{_p_version.major}{_p_version.minor}-{_arch}-linux-android.so'"
+
+        with open(python_file, "r") as f:
+            file_data += "\n" + f.read()
+
+        wrapper_dir = join(self.get_build_dir(arch.arch), "p4a_python_wrapper")
+        ensure_dir(wrapper_dir)
+        wrapper_path = join(wrapper_dir, "python")
+        with open(wrapper_path, "w") as f:
+            f.write(file_data)
+        chmod(wrapper_path, 0o755)
+
+        return wrapper_path
+
     def get_recipe_meson_options(self, arch):
         env = self.get_recipe_env(arch, with_flags_in_cc=True)
         return {
             "binaries": {
+                "python": self.get_python_wrapper(arch),
                 "c": arch.get_clang_exe(with_target=True),
                 "cpp": arch.get_clang_exe(with_target=True, plus_plus=True),
                 "ar": self.ctx.ndk.llvm_ar,
@@ -1488,13 +1535,18 @@ def build_arch(self, arch):
         self.ensure_args('-Csetup-args=--cross-file', '-Csetup-args={}'.format(cross_file))
         # ensure ninja and meson
         for dep in [
-            "ninja=={}".format(self.ninja_version),
+            "ninja",
             "meson=={}".format(self.meson_version),
         ]:
             if dep not in self.hostpython_prerequisites:
                 self.hostpython_prerequisites.append(dep)
+
         if not self.skip_python:
             super().build_arch(arch)
+        else:
+            self.install_hostpython_prerequisites(
+                packages=["build[virtualenv]", "pip", "setuptools", "patchelf"] + self.hostpython_prerequisites
+            )
 
 
 class RustCompiledComponentsRecipe(PyProjectRecipe):

pythonforandroid/recipes/matplotlib/__init__.py

@@ -12,6 +12,7 @@ class MatplotlibRecipe(MesonRecipe):
         "pyparsing",
         "python-dateutil",
     ]
+    hostpython_prerequisites = ["meson-python>=0.13.1,<0.17.0", "pybind11>=2.13.2,!=2.13.3", "setuptools_scm>=7"]
     need_stl_shared = True
 
     def get_recipe_env(self, arch, **kwargs):

pythonforandroid/recipes/python3/__init__.py

@@ -82,7 +82,6 @@ class Python3Recipe(TargetPythonRecipe):
 
         # Android prefix
         '--prefix={prefix}',
-        '--exec-prefix={exec_prefix}',
         '--enable-loadable-sqlite-extensions',
 
         # Special cross compile args
@@ -211,11 +210,17 @@ def apply_patches(self, arch, build_dir=None):
         super().apply_patches(arch, build_dir)
 
     def include_root(self, arch_name):
-        return join(self.get_build_dir(arch_name), 'Include')
+        return glob.glob(join(self.get_build_dir(arch_name), 'android-build', 'android-root', 'include/*/'))[0]
 
     def link_root(self, arch_name):
         return join(self.get_build_dir(arch_name), 'android-build')
 
+    def get_python_root(self, arch):
+        return join(self.get_build_dir(arch.arch), 'android-build', 'android-root')
+
+    def get_android_python_exe(self, arch):
+        return join(self.get_python_root(arch), 'bin', self.name)
+
     def should_build(self, arch):
         return not isfile(join(self.link_root(arch.arch), self._libpython))
 
@@ -342,9 +347,8 @@ def build_arch(self, arch):
         build_dir = join(recipe_build_dir, 'android-build')
         ensure_dir(build_dir)
 
-        # TODO: Get these dynamically, like bpo-30386 does
-        sys_prefix = '/usr/local'
-        sys_exec_prefix = '/usr/local'
+        sys_prefix = join(build_dir, "android-root")
+        ensure_dir(sys_prefix)
 
         env = self.get_recipe_env(arch)
         env = self.set_libs_flags(env, arch)
@@ -363,8 +367,7 @@ def build_arch(self, arch):
                                     python_host_bin=self.get_recipe(
                                         'host' + self.name, self.ctx
                                     ).python_exe,
-                                    prefix=sys_prefix,
-                                    exec_prefix=sys_exec_prefix)).split(' '),
+                                    prefix=sys_prefix).split(' ')),
                     _env=env)
 
             shprint(
@@ -373,6 +376,8 @@ def build_arch(self, arch):
                 'INSTSONAME={lib_name}'.format(lib_name=self._libpython),
                 _env=env
             )
+            shprint(sh.make, 'install', _env=env)
+
             # rename executable
             if isfile("python"):
                 sh.cp('python', 'libpythonbin.so')

pythonforandroid/recipes/scipy/__init__.py

@@ -17,7 +17,6 @@ class ScipyRecipe(MesonRecipe):
 
     def get_recipe_meson_options(self, arch):
         options = super().get_recipe_meson_options(arch)
-        options["binaries"]["python"] = self.ctx.python_recipe.python_exe
         options["binaries"]["fortran"] = self.place_wrapper(arch)
         options["properties"]["numpy-include-dir"] = join(
             self.ctx.get_python_install_dir(arch.arch), "numpy/_core/include"