From 750d3de995586c6e27e359e16464608c1882f4d9 Mon Sep 17 00:00:00 2001 From: f321x Date: Wed, 18 Nov 2026 12:28:57 +0100 Subject: [PATCH] python3, hostpython3: update to 3.14.10 Drop 3.14_armv7l_fix.patch: CPython maps the "arm" machine to the armeabi_v7a ABI itself since 3.14.4, so the patch no longer applies. https://github.com/python/cpython/commit/ab3d37fab654e2a11a65f05022371e3ea2d8f770 --- doc/source/buildoptions.rst | 2 +- pythonforandroid/recipes/hostpython3/__init__.py | 2 +- pythonforandroid/recipes/python3/__init__.py | 3 +-- .../recipes/python3/patches/3.14_armv7l_fix.patch | 12 ------------ 4 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 pythonforandroid/recipes/python3/patches/3.14_armv7l_fix.patch diff --git a/doc/source/buildoptions.rst b/doc/source/buildoptions.rst index 45ef3a9f5b..094d205ebd 100644 --- a/doc/source/buildoptions.rst +++ b/doc/source/buildoptions.rst @@ -10,7 +10,7 @@ Python versions python-for-android supports using non-end-of-life Python 3 versions. To explicitly select a Python version in your requirements, use e.g. -``--requirements=python3==3.14.2,hostpython3==3.14.2``. +``--requirements=python3==3.14.10,hostpython3==3.14.10``. The last python-for-android version supporting Python2 was `v2019.10.06 `__ diff --git a/pythonforandroid/recipes/hostpython3/__init__.py b/pythonforandroid/recipes/hostpython3/__init__.py index e44dba605f..70b72105c3 100644 --- a/pythonforandroid/recipes/hostpython3/__init__.py +++ b/pythonforandroid/recipes/hostpython3/__init__.py @@ -32,7 +32,7 @@ class HostPython3Recipe(Recipe): :class:`~pythonforandroid.python.HostPythonRecipe` """ - version = "3.14.2" + version = "3.14.10" url = "https://github.com/python/cpython/archive/refs/tags/v{version}.tar.gz" """The default url to download our host python recipe. This url will diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py index 46048364ae..391b957031 100644 --- a/pythonforandroid/recipes/python3/__init__.py +++ b/pythonforandroid/recipes/python3/__init__.py @@ -54,7 +54,7 @@ class Python3Recipe(TargetPythonRecipe): :class:`~pythonforandroid.python.GuestPythonRecipe` ''' - version = '3.14.2' + version = '3.14.10' url = 'https://github.com/python/cpython/archive/refs/tags/v{version}.tar.gz' name = 'python3' @@ -208,7 +208,6 @@ def apply_patches(self, arch, build_dir=None): self.patches.append('patches/cpython-311-ctypes-find-library.patch') if _p_version.minor >= 14: - self.patches.append('patches/3.14_armv7l_fix.patch') self.patches.append('patches/3.14_fix_remote_debug.patch') if shutil.which('lld') is not None: diff --git a/pythonforandroid/recipes/python3/patches/3.14_armv7l_fix.patch b/pythonforandroid/recipes/python3/patches/3.14_armv7l_fix.patch deleted file mode 100644 index 7565489a28..0000000000 --- a/pythonforandroid/recipes/python3/patches/3.14_armv7l_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff '--color=auto' -uNr cpython-3.14.0/Lib/sysconfig/__init__.py cpython-3.14.0.mod/Lib/sysconfig/__init__.py ---- cpython-3.14.0/Lib/sysconfig/__init__.py 2025-10-07 21:45:41.236149298 +0530 -+++ cpython-3.14.0.mod/Lib/sysconfig/__init__.py 2025-10-07 21:45:54.650245131 +0530 -@@ -702,7 +702,7 @@ - "x86_64": "x86_64", - "i686": "x86", - "aarch64": "arm64_v8a", -- "armv7l": "armeabi_v7a", -+ "arm": "armeabi_v7a", - }[machine] - elif osname == "linux": - # At least on Linux/Intel, 'machine' is the processor --