Merge pull request #809 from kiwix/python3.13+_friendly_android-ndk-r21e
Enabled android-ndk to work with Python 3.12+
This commit is contained in:
commit
1aa720a7fd
|
@ -24,6 +24,10 @@ class android_ndk(Dependency):
|
||||||
def source_dir(self):
|
def source_dir(self):
|
||||||
return self.target.full_name()
|
return self.target.full_name()
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
"android-ndk-r21e-linux-x86_64-python3.12+.patch",
|
||||||
|
]
|
||||||
|
|
||||||
class Builder(Builder):
|
class Builder(Builder):
|
||||||
@property
|
@property
|
||||||
def install_path(self):
|
def install_path(self):
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
diff -ur android-ndk-r21e/build/tools/make_standalone_toolchain.py android-ndk-r21e.patched/build/tools/make_standalone_toolchain.py
|
||||||
|
--- android-ndk-r21e/build/tools/make_standalone_toolchain.py 2025-03-04 20:48:14.681288830 +0400
|
||||||
|
+++ android-ndk-r21e.patched/build/tools/make_standalone_toolchain.py 2025-03-05 12:10:47.252578915 +0400
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/env python
|
||||||
|
+#!/usr/bin/env python3
|
||||||
|
#
|
||||||
|
# Copyright (C) 2016 The Android Open Source Project
|
||||||
|
#
|
||||||
|
@@ -21,7 +21,6 @@
|
||||||
|
"""
|
||||||
|
import argparse
|
||||||
|
import atexit
|
||||||
|
-from distutils.dir_util import copy_tree
|
||||||
|
import inspect
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
@@ -221,13 +220,13 @@
|
||||||
|
|
||||||
|
def create_toolchain(install_path, arch, api, toolchain_path, host_tag):
|
||||||
|
"""Create a standalone toolchain."""
|
||||||
|
- copy_tree(toolchain_path, install_path)
|
||||||
|
+ shutil.copytree(toolchain_path, install_path)
|
||||||
|
triple = get_triple(arch)
|
||||||
|
make_clang_scripts(install_path, arch, api, host_tag == 'windows-x86_64')
|
||||||
|
replace_gcc_wrappers(install_path, triple, host_tag == 'windows-x86_64')
|
||||||
|
|
||||||
|
prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
|
||||||
|
- copy_tree(prebuilt_path, install_path)
|
||||||
|
+ shutil.copytree(prebuilt_path, install_path, dirs_exist_ok=True)
|
||||||
|
|
||||||
|
gdbserver_path = os.path.join(
|
||||||
|
NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
|
|
@ -33,7 +33,7 @@ release_versions = {
|
||||||
|
|
||||||
# This is the "version" of the whole base_deps_versions dict.
|
# This is the "version" of the whole base_deps_versions dict.
|
||||||
# Change this when you change base_deps_versions.
|
# Change this when you change base_deps_versions.
|
||||||
base_deps_meta_version = "11"
|
base_deps_meta_version = "12"
|
||||||
|
|
||||||
base_deps_versions = {
|
base_deps_versions = {
|
||||||
"zlib": "1.2.12",
|
"zlib": "1.2.12",
|
||||||
|
|
Loading…
Reference in New Issue