Replace obsoleted Python distutils.spawn.find_executable by shutil.which

Fix Android target names and add flags for 16KB page size

android.py

@@ -62,18 +62,20 @@ def get_api_version_or_min(opts: AndroidOpts, target: str) -> str:
 def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
     extra_target_envs = {
         'armv7': {
-            'android-armeabi-v7a_CFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-march=armv7-a', '-mtune=cortex-a8', '-mfpu=vfp', '-mfloat-abi=softfp'],
-            'android-armeabi-v7a_CXXFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-march=armv7-a', '-mtune=cortex-a8', '-mfpu=vfp', '-mfloat-abi=softfp'],
-            'android-armeabi-v7a_LDFLAGS': ['-Wl,--fix-cortex-a8']
+            'android-armv7_CFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-march=armv7-a', '-mtune=cortex-a8', '-mfpu=vfp', '-mfloat-abi=softfp'],
+            'android-armv7_CXXFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-march=armv7-a', '-mtune=cortex-a8', '-mfpu=vfp', '-mfloat-abi=softfp'],
+            'android-armv7_LDFLAGS': ['-Wl,--fix-cortex-a8']
         },
         'arm64v8': {
-            'android-arm64-v8a_CFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-DL_cuserid=9', '-DANDROID64'],
-            'android-arm64-v8a_CXXFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-DL_cuserid=9', '-DANDROID64']
+            'android-arm64v8_CFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-DL_cuserid=9', '-DANDROID64'],
+            'android-arm64v8_CXXFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-DL_cuserid=9', '-DANDROID64'],
+            'android-arm64v8_LDFLAGS': ['-Wl,-z,max-page-size=16384', '-Wl,-z,common-page-size=16384']
         },
         'x86': {},
         'x86_64': {
             'android-x86_64_CFLAGS': ['-DL_cuserid=9'],
-            'android-x86_64_CXXFLAGS': ['-DL_cuserid=9']
+            'android-x86_64_CXXFLAGS': ['-DL_cuserid=9'],
+            'android-x86_64_LDFLAGS': ['-Wl,-z,max-page-size=16384', '-Wl,-z,common-page-size=16384']
         }
     }
     env.update(extra_target_envs[target])

bcl.py

@@ -132,10 +132,10 @@ def make_product(opts: BclOpts, product: str):
         run_command('make', args=test_make_args, name='make tests')
 
     # Copy the bcl profiles to the output directory
-    from distutils.dir_util import copy_tree
+    from shutil import copytree
     for profile in profiles:
         profile_dir = get_profile_dir(profile, product)
-        copy_tree('%s/mcs/class/lib/%s' % (opts.mono_source_root, profile_dir), '%s/%s' % (install_dir, profile_dir))
+        copytree('%s/mcs/class/lib/%s' % (opts.mono_source_root, profile_dir), '%s/%s' % (install_dir, profile_dir))
 
     # Remove unneeded files
     import glob

desktop.py

@@ -231,13 +231,13 @@ def make(opts: DesktopOpts, product: str, target_platform: str, target: str):
         strip_libs(opts, product, target_platform, target)
 
 def copy_bcl(opts: DesktopOpts, product: str, target_platform: str, target: str):
-    from distutils.dir_util import copy_tree
+    from shutil import copytree
     from bcl import get_profile_install_dirs
     dest_dir = path_join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration), 'lib/mono/4.5')
     for src_dir in get_profile_install_dirs(opts, 'desktop-win32' if target_platform == 'windows' else 'desktop'):
         if not os.path.isdir(src_dir):
             raise BuildError('BCL source directory does not exist: %s. The BCL must be built prior to this.' % src_dir)
-        copy_tree(src_dir, dest_dir)
+        copytree(src_dir, dest_dir)
 
 def clean(opts: DesktopOpts, product: str, target_platform: str, target: str):
     rm_rf(

files/patches/btls-cmake-android-16kb-page-size.diff

@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index 2c052530..6bf193fd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5976,13 +5976,13 @@ if test "x$enable_btls" = "xyes"; then
+ 		BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi-v7a\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
+ 		;;
+ 	android-v8a)
+-		BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
++		BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api -DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-z,max-page-size=16384\""
+ 		;;
+ 	android-x86)
+ 		BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
+ 		;;
+ 	android-x64)
+-		BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
++		BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api -DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-z,max-page-size=16384\""
+ 		;;
+ 	riscv32)
+ 		btls_arch=riscv32

files/patches/emscripten-python-3.12.diff

@@ -0,0 +1,25 @@
+diff -aur a/tools/shared.py b/tools/shared.py
+--- a/tools/shared.py 2025-10-14 09:16:13.210070677 +0000
++++ b/tools/shared.py 2025-10-14 09:15:07.106178680 +0000
+@@ -5,7 +5,7 @@
+ 
+ from __future__ import print_function
+ 
+-from distutils.spawn import find_executable
++from shutil import which
+ from subprocess import PIPE, STDOUT
+ import atexit
+ import base64
+@@ -212,10 +212,10 @@
+   config_file = '\n'.join(config_file)
+   # autodetect some default paths
+   config_file = config_file.replace('\'{{{ EMSCRIPTEN_ROOT }}}\'', repr(__rootpath__))
+-  llvm_root = os.path.dirname(find_executable('llvm-dis') or '/usr/bin/llvm-dis')
++  llvm_root = os.path.dirname(which('llvm-dis') or '/usr/bin/llvm-dis')
+   config_file = config_file.replace('\'{{{ LLVM_ROOT }}}\'', repr(llvm_root))
+ 
+-  node = find_executable('nodejs') or find_executable('node') or 'node'
++  node = which('nodejs') or which('node') or 'node'
+   config_file = config_file.replace('\'{{{ NODE }}}\'', repr(node))
+ 
+   abspath = os.path.abspath(os.path.expanduser(path))

patch_emscripten.py

@@ -18,11 +18,15 @@ def main(raw_args):
 
     args = parser.parse_args(raw_args)
 
+    this_script_dir = os.path.dirname(os.path.realpath(__file__))
+    patches_dir = os.path.join(this_script_dir, 'files', 'patches')
+
     mono_source_root = args.mono_sources
     emsdk_root = get_emsdk_root()
 
     patches = [
         '%s/sdks/builds/fix-emscripten-8511.diff' % mono_source_root,
+        '%s/emscripten-python-3.12.diff' % patches_dir,
     ]
 
     from subprocess import Popen

patch_mono.py

@@ -34,10 +34,11 @@ def main(raw_args):
         'wasm_m2n_trampolines_hook.diff',
         'btls-cmake-args-linux-mingw.diff',
         'btls-cmake-arm64.diff',
-        'llvm-osx-regex-conflict.diff',
+        'btls-cmake-android-16kb-page-size.diff',
         'offsets-tool-extra-cflags.diff',
         'offsets-tool-newer-clang.diff',
         'offsets-tool-duplicate-fields.diff',
+        'llvm-osx-regex-conflict.diff',
     ]
 
     from subprocess import Popen