DWE-4580 changes for Python 3.13

updated dependencies and build scripts

Author: harrylime3man

Android/build_deps.py

@@ -66,25 +66,26 @@ def make_install(self):
         self.run(['install', '-Dm644', 'bzlib.h', '-t', str(SYSROOT / 'usr' / 'include')])
 
 class GDBM(Package):
-    source = 'https://ftp.gnu.org/gnu/gdbm/gdbm-1.23.tar.gz'
+    source = 'https://ftp.gnu.org/gnu/gdbm/gdbm-1.24.tar.gz'
     configure_args = ['--enable-libgdbm-compat']
 
 class LibFFI(Package):
-    source = 'https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz'
+    source = 'https://github.com/libffi/libffi/releases/download/v3.4.7/libffi-3.4.7.tar.gz'
     # libffi may fail to configure with Docker on WSL2 (#33)
     configure_args = ['--disable-builddir']
 
 class LibUUID(Package):
-    source = 'https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.xz'
+    source = 'https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.4.tar.xz'
     configure_args = ['--disable-all-programs', '--enable-libuuid']
 
 class NCurses(Package):
-    source = 'https://ftp.gnu.org/gnu/ncurses/ncurses-6.4.tar.gz'
+    source = 'https://ftp.gnu.org/gnu/ncurses/ncurses-6.5.tar.gz'
     # Not stripping the binaries as there is no easy way to specify the strip program for Android
     configure_args = ['--without-ada', '--enable-widec', '--without-debug', '--without-cxx-binding', '--disable-stripping']
 
 class OpenSSL(Package):
-    source = 'https://www.openssl.org/source/openssl-3.0.12.tar.gz'
+    # was 3.0.12
+    source = 'https://www.openssl.org/source/openssl-3.4.0.tar.gz'
 
     def configure(self):
         # OpenSSL handles NDK internal paths by itself
@@ -119,7 +120,7 @@ class SQLite(Package):
     source = 'https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz'
 
 class XZ(Package):
-    source = 'https://tukaani.org/xz/xz-5.6.2.tar.xz'
+    source = 'https://tukaani.org/xz/xz-5.6.4.tar.xz'
 
     def make(self):
         print('******************** About to run make')

README.md

@@ -1,14 +1,14 @@
 Python 3 Android
 ================
 
-This is an experimental set of build scripts that will cross-compile Python 3.12.4 for an Android device.
+This is an experimental set of build scripts that will cross-compile Python 3.13.0 for an Android device.
 
 Building requires:
 -----
 
 1. Linux. This project might work on other systems supported by NDK but no guarantee.
-2. Android NDK r26d installed and environment variable ``$ANDROID_NDK`` points to its root directory. Older NDK may not work and NDK <= r18 is known to be incompatible.
-   <br>An example of how to set the environment variable would be ``export ANDROID_NDK="/home/myuser/android-ndk-r26d-linux" >> $HOME/.bashrc``
+2. Android NDK r28 installed and environment variable ``$ANDROID_NDK`` points to its root directory. Older NDK may not work and NDK <= r18 is known to be incompatible.
+   <br>An example of how to set the environment variable would be ``export ANDROID_NDK="/home/myuser/android-ndk-r30-linux" >> $HOME/.bashrc``
 
 <br>
 Running requires:
@@ -24,9 +24,9 @@ Build
 1. Run `sudo ./clean.sh` for good measure, and after each build.
 2. You will need a separate build run for every API Level/architecture combination you wish to run on:
    <br>Here are a couple of examples to build a static version of the library with docker.
-   * Build 64 bit `sudo docker run --rm -it -v $(pwd):/python3-android -v /mnt/c/SPE/android-ndk-r26d --env ARCH=arm64 --env ANDROID_API=30 python:3.12.4-slim /python3-android/docker-build.sh --enable-shared --without-ensurepip --disable-ipv6 --with-build-python`
-   * Build 32 bit `sudo docker run --rm -it -v $(pwd):/python3-android -v /mnt/c/SPE/android-ndk-r26d --env ARCH=arm --env ANDROID_API=30 python:3.12.4-slim /python3-android/docker-build.sh --enable-shared --without-ensurepip --disable-ipv6 --with-build-python`
-   * Build x86_64 `sudo docker run --rm -it -v $(pwd):/python3-android -v /mnt/c/SPE/android-ndk-r26d --env ARCH=x86_64 --env ANDROID_API=30 python:3.12.4-slim /python3-android/docker-build.sh --enable-shared --without-ensurepip --disable-ipv6 --with-build-python`
+   * Build 64 bit `sudo docker run --rm -it -v $(pwd):/python3-android -v /mnt/c/SPE/android-ndk-r30 --env ARCH=arm64 --env ANDROID_API=30 python:3.13.0-slim /python3-android/docker-build.sh --enable-shared --without-ensurepip --disable-ipv6 --with-build-python`
+   * Build 32 bit `sudo docker run --rm -it -v $(pwd):/python3-android -v /mnt/c/SPE/android-ndk-r30 --env ARCH=arm --env ANDROID_API=30 python:3.13.0-slim /python3-android/docker-build.sh --enable-shared --without-ensurepip --disable-ipv6 --with-build-python`
+   * Build x86_64 `sudo docker run --rm -it -v $(pwd):/python3-android -v /mnt/c/SPE/android-ndk-r30 --env ARCH=x86_64 --env ANDROID_API=30 python:3.13.0-slim /python3-android/docker-build.sh --enable-shared --without-ensurepip --disable-ipv6 --with-build-python`
 
 
 Installation & Running

build.sh

@@ -5,7 +5,7 @@ set -x
 
 THIS_DIR="$PWD"
 
-PYVER=3.12.4
+PYVER=3.13.0
 SRCDIR=src/Python-$PYVER
 
 COMMON_ARGS="--arch ${ARCH:-arm} --api ${ANDROID_API:-30}"
@@ -25,9 +25,7 @@ fi
 
 cp -r Android $SRCDIR
 pushd $SRCDIR
-patch -Np1 -i ./Android/unversioned-libpython.patch
 autoreconf -ifv
-patch -Np1 -i ./Android/bldlibrary.patch
 ./Android/build_deps.py $COMMON_ARGS
 ./Android/configure.py $COMMON_ARGS --prefix=/usr "$@"
 make

docker-build.sh

@@ -6,12 +6,12 @@ set -x
 apt-get update -y
 apt-get install -y autoconf-archive autoconf automake cmake gawk gettext git gcc make patch pkg-config xz-utils
 
-export ANDROID_NDK=/android-ndk
+# export ANDROID_NDK=/android-ndk
 
 if [ ! -d "$ANDROID_NDK" ] ; then
     # In general we don't want download NDK for every build, but it is simpler to do it here
     # for CI builds
-    NDK_VER=r26d
+    NDK_VER=r28
     apt-get install -y wget zip
     wget --no-verbose https://dl.google.com/android/repository/android-ndk-$NDK_VER-linux.zip
     unzip android-ndk-${NDK_VER}-linux.zip