From e80c8e2a11862fb2e140cf3bbffff765895a6a0b Mon Sep 17 00:00:00 2001 From: arlen Date: Wed, 9 Aug 2023 12:43:16 +0000 Subject: [PATCH 01/26] cross compile python3 for android on linux --- ...-define-ctypes_pythonapi-for-Android.patch | 13 +++++++++++ ports/python3/portfile.cmake | 23 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch diff --git a/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch b/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch new file mode 100644 index 00000000000000..86e693071e4901 --- /dev/null +++ b/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch @@ -0,0 +1,13 @@ + +diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py +--- a/Lib/ctypes/__init__.py ++++ b/Lib/ctypes/__init__.py +@@ -460,6 +460,8 @@ + pythonapi = PyDLL("python dll", None, _sys.dllhandle) + elif _sys.platform == "cygwin": + pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) ++elif _os.environ.get('ANDROID_BOOTLOGO') == '1': ++ pythonapi = PyDLL("libpython%d.%d.so" % _sys.version_info[:2]) + else: + pythonapi = PyDLL(None) + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index fb2d9b7c56b5b8..1f28c32fc2912e 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -19,6 +19,14 @@ set(PATCHES 0014-fix-get-python-inc-output.patch ) +if (VCPKG_CROSSCOMPILING AND VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + message(STATUS "Warning: static library with cross-compiling is not supported. Building dynamic library.") + set(VCPKG_LIBRARY_LINKAGE dynamic) + list(APPEND PATCHES + 0016-explicit-define-ctypes_pythonapi-for-Android.patch + ) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES 0002-static-library.patch) endif() @@ -232,6 +240,21 @@ else() "--without-readline" "--disable-test-modules" ) + if(VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_ANDROID) + if(NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 29) + endif() + set(VCPKG_MAKE_BUILD_TRIPLET "${VCPKG_MAKE_BUILD_TRIPLET} --build=x86_64-linux-gnu") + set(OPTIONS "${OPTIONS}" + # For CONFIG_SITE property needed while cross-compile + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=no" + "ac_cv_buggy_getaddrinfo=no" # For check IPv6 functionality + ) + set(ENV{READELF} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-readelf) + set(ENV{CC} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${VCPKG_CMAKE_SYSTEM_VERSION}-clang) + endif() + if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS "LIBS=-liconv -lintl") endif() From b7b0541c6e275d7ca8da52302409d0eb42c4676d Mon Sep 17 00:00:00 2001 From: arlen Date: Wed, 9 Aug 2023 13:51:44 +0000 Subject: [PATCH 02/26] add port-version --- ports/python3/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 18a769273ee49c..bd67c57859b71f 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "python3", "version": "3.11.4", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", From 352a97f1851ab20cd6e66646019c1c345e42c0c7 Mon Sep 17 00:00:00 2001 From: arlen Date: Wed, 9 Aug 2023 14:15:37 +0000 Subject: [PATCH 03/26] disable soversion for android to avoid ld link error in android runtime --- .../0015-disable-SOVERSION-for-Android.patch | 33 +++++++++++++++++++ ports/python3/portfile.cmake | 1 + 2 files changed, 34 insertions(+) create mode 100644 ports/python3/0015-disable-SOVERSION-for-Android.patch diff --git a/ports/python3/0015-disable-SOVERSION-for-Android.patch b/ports/python3/0015-disable-SOVERSION-for-Android.patch new file mode 100644 index 00000000000000..91c82e80cefb91 --- /dev/null +++ b/ports/python3/0015-disable-SOVERSION-for-Android.patch @@ -0,0 +1,33 @@ +diff --git a/configure.ac b/configure.ac +index 73ee71c6d2..a62edaebae 100644 +--- a/configure ++++ b/configure +@@ -5993,7 +5993,10 @@ + LDLIBRARY='libpython$(LDVERSION).so' + BLDLIBRARY='-L. -lpython$(LDVERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +- INSTSONAME="$LDLIBRARY".$SOVERSION ++ if test $ac_sys_system != Linux-android ++ then ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ fi + if test "$with_pydebug" != yes + then + PY3LIBRARY=libpython3.so + +diff --git a/configure.ac b/configure.ac +index 73ee71c6d2..a62edaebae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1153,7 +1153,10 @@ + LDLIBRARY='libpython$(LDVERSION).so' + BLDLIBRARY='-L. -lpython$(LDVERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +- INSTSONAME="$LDLIBRARY".$SOVERSION ++ if test $ac_sys_system != Linux-android ++ then ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ fi + if test "$with_pydebug" != yes + then + PY3LIBRARY=libpython3.so diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 1f28c32fc2912e..4760244f1a5ffa 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -23,6 +23,7 @@ if (VCPKG_CROSSCOMPILING AND VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") message(STATUS "Warning: static library with cross-compiling is not supported. Building dynamic library.") set(VCPKG_LIBRARY_LINKAGE dynamic) list(APPEND PATCHES + 0015-disable-SOVERSION-for-Android.patch 0016-explicit-define-ctypes_pythonapi-for-Android.patch ) endif() From aef67be62f631fca4895392239ff7a9f1e8c9765 Mon Sep 17 00:00:00 2001 From: arlen Date: Wed, 9 Aug 2023 14:40:06 +0000 Subject: [PATCH 04/26] merge to OPTIONS --- ports/python3/portfile.cmake | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 4760244f1a5ffa..c0d7f374cce83a 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -241,21 +241,6 @@ else() "--without-readline" "--disable-test-modules" ) - if(VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_ANDROID) - if(NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - set(VCPKG_CMAKE_SYSTEM_VERSION 29) - endif() - set(VCPKG_MAKE_BUILD_TRIPLET "${VCPKG_MAKE_BUILD_TRIPLET} --build=x86_64-linux-gnu") - set(OPTIONS "${OPTIONS}" - # For CONFIG_SITE property needed while cross-compile - "ac_cv_file__dev_ptmx=yes" - "ac_cv_file__dev_ptc=no" - "ac_cv_buggy_getaddrinfo=no" # For check IPv6 functionality - ) - set(ENV{READELF} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-readelf) - set(ENV{CC} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${VCPKG_CMAKE_SYSTEM_VERSION}-clang) - endif() - if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS "LIBS=-liconv -lintl") endif() @@ -265,6 +250,21 @@ else() if(VCPKG_CROSSCOMPILING) set(_python_for_build "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") list(APPEND OPTIONS "--with-build-python=${_python_for_build}") + + if(VCPKG_TARGET_IS_ANDROID) + list(APPEND OPTIONS + "--build=x86_64-linux-gnu" + # For CONFIG_SITE property needed while cross-compile: https://docs.python.org/3/using/configure.html#cmdoption-arg-CONFIG_SITE + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=no" + "ac_cv_buggy_getaddrinfo=no" + ) + if(NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 29) + endif() + set(ENV{READELF} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-readelf) + set(ENV{CC} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${VCPKG_CMAKE_SYSTEM_VERSION}-clang) + endif() else() vcpkg_find_acquire_program(PYTHON3) list(APPEND OPTIONS "ac_cv_prog_PYTHON_FOR_REGEN=${PYTHON3}") From 578dc87fc414c42815925b853816a8c8b2f93592 Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 03:08:10 +0000 Subject: [PATCH 05/26] use x-add-version to generate the corresponding json --- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 18ccdeeabcfaf8..9c1598a7090900 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6598,7 +6598,7 @@ }, "python3": { "baseline": "3.11.4", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.5", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 093119be4b232b..2057f0e4a4018e 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81c1c49eb032f1ee919a075ef7213d3dbe5a8e6f", + "version": "3.11.4", + "port-version": 1 + }, { "git-tree": "1ed9aa74ea44d2e4457410ad732d165317c6f8aa", "version": "3.11.4", From 44304ff8eaaaa4cf118582025e016be29fa4a5a0 Mon Sep 17 00:00:00 2001 From: HAOZHE LI Date: Thu, 10 Aug 2023 11:12:59 +0800 Subject: [PATCH 06/26] Update ports/python3/portfile.cmake Co-authored-by: Kai Pastor --- ports/python3/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index c0d7f374cce83a..72a0e7da13b8c5 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -19,7 +19,7 @@ set(PATCHES 0014-fix-get-python-inc-output.patch ) -if (VCPKG_CROSSCOMPILING AND VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") +if (VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_ANDROID) message(STATUS "Warning: static library with cross-compiling is not supported. Building dynamic library.") set(VCPKG_LIBRARY_LINKAGE dynamic) list(APPEND PATCHES From 0cd257c2d40ebebf92d7e1ed7b658ddd8492cabd Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 03:33:47 +0000 Subject: [PATCH 07/26] use sys.getandroidapilevel to judge if is running on Android --- .../0016-explicit-define-ctypes_pythonapi-for-Android.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch b/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch index 86e693071e4901..245ceac2373f89 100644 --- a/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch +++ b/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch @@ -6,7 +6,7 @@ diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py pythonapi = PyDLL("python dll", None, _sys.dllhandle) elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) -+elif _os.environ.get('ANDROID_BOOTLOGO') == '1': ++elif hasattr(sys, 'getandroidapilevel'): + pythonapi = PyDLL("libpython%d.%d.so" % _sys.version_info[:2]) else: pythonapi = PyDLL(None) From 08f1ef228bb3e21668a9537ea5c722e6f2d3b6b4 Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 05:50:36 +0000 Subject: [PATCH 08/26] delete patch to auto generated configure file --- .../0015-disable-SOVERSION-for-Android.patch | 17 ----------------- ports/python3/portfile.cmake | 12 ++++++------ 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/ports/python3/0015-disable-SOVERSION-for-Android.patch b/ports/python3/0015-disable-SOVERSION-for-Android.patch index 91c82e80cefb91..77bfcb4f6d9913 100644 --- a/ports/python3/0015-disable-SOVERSION-for-Android.patch +++ b/ports/python3/0015-disable-SOVERSION-for-Android.patch @@ -1,20 +1,3 @@ -diff --git a/configure.ac b/configure.ac -index 73ee71c6d2..a62edaebae 100644 ---- a/configure -+++ b/configure -@@ -5993,7 +5993,10 @@ - LDLIBRARY='libpython$(LDVERSION).so' - BLDLIBRARY='-L. -lpython$(LDVERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -- INSTSONAME="$LDLIBRARY".$SOVERSION -+ if test $ac_sys_system != Linux-android -+ then -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ fi - if test "$with_pydebug" != yes - then - PY3LIBRARY=libpython3.so - diff --git a/configure.ac b/configure.ac index 73ee71c6d2..a62edaebae 100644 --- a/configure.ac diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 72a0e7da13b8c5..6608de7a6125d5 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -250,20 +250,20 @@ else() if(VCPKG_CROSSCOMPILING) set(_python_for_build "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") list(APPEND OPTIONS "--with-build-python=${_python_for_build}") - + if(VCPKG_TARGET_IS_ANDROID) + if(NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 29) + endif() list(APPEND OPTIONS "--build=x86_64-linux-gnu" + "CC=$ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${VCPKG_CMAKE_SYSTEM_VERSION}-clang" + "READELF=$ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-readelf" # For CONFIG_SITE property needed while cross-compile: https://docs.python.org/3/using/configure.html#cmdoption-arg-CONFIG_SITE "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=no" "ac_cv_buggy_getaddrinfo=no" ) - if(NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - set(VCPKG_CMAKE_SYSTEM_VERSION 29) - endif() - set(ENV{READELF} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-readelf) - set(ENV{CC} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${VCPKG_CMAKE_SYSTEM_VERSION}-clang) endif() else() vcpkg_find_acquire_program(PYTHON3) From fb3b7202d9784cf425945f324b382886dc170959 Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 06:39:04 +0000 Subject: [PATCH 09/26] apply 0015 and 0016 always --- ports/python3/portfile.cmake | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 6608de7a6125d5..1e9f306b7dccc5 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -17,17 +17,10 @@ set(PATCHES 0010-dont-skip-rpath.patch 0012-force-disable-curses.patch 0014-fix-get-python-inc-output.patch + 0015-disable-SOVERSION-for-Android.patch + 0016-explicit-define-ctypes_pythonapi-for-Android.patch ) -if (VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_ANDROID) - message(STATUS "Warning: static library with cross-compiling is not supported. Building dynamic library.") - set(VCPKG_LIBRARY_LINKAGE dynamic) - list(APPEND PATCHES - 0015-disable-SOVERSION-for-Android.patch - 0016-explicit-define-ctypes_pythonapi-for-Android.patch - ) -endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES 0002-static-library.patch) endif() From 1f2450c8d4839db8e36abb06e9239d855774d23a Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 07:39:43 +0000 Subject: [PATCH 10/26] run ./vcpkg x-add-version python3 --overwrite-version --- versions/p-/python3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 2057f0e4a4018e..c1d1dd5fd5b456 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "81c1c49eb032f1ee919a075ef7213d3dbe5a8e6f", + "git-tree": "cfd71aa2a8099ff83e8385fc1907335fc75ef4a7", "version": "3.11.4", "port-version": 1 }, From 5cf00f061399f3c18163a9caaea45c939dfcdedb Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 07:41:53 +0000 Subject: [PATCH 11/26] rename patch files to resolve conflict --- ...Android.patch => 0017-disable-SOVERSION-for-Android.patch} | 0 ...> 0018-explicit-define-ctypes_pythonapi-for-Android.patch} | 0 ports/python3/portfile.cmake | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename ports/python3/{0015-disable-SOVERSION-for-Android.patch => 0017-disable-SOVERSION-for-Android.patch} (100%) rename ports/python3/{0016-explicit-define-ctypes_pythonapi-for-Android.patch => 0018-explicit-define-ctypes_pythonapi-for-Android.patch} (100%) diff --git a/ports/python3/0015-disable-SOVERSION-for-Android.patch b/ports/python3/0017-disable-SOVERSION-for-Android.patch similarity index 100% rename from ports/python3/0015-disable-SOVERSION-for-Android.patch rename to ports/python3/0017-disable-SOVERSION-for-Android.patch diff --git a/ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch b/ports/python3/0018-explicit-define-ctypes_pythonapi-for-Android.patch similarity index 100% rename from ports/python3/0016-explicit-define-ctypes_pythonapi-for-Android.patch rename to ports/python3/0018-explicit-define-ctypes_pythonapi-for-Android.patch diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index d21fc0f3e041a7..e935dec3ea4606 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,8 +18,8 @@ set(PATCHES 0012-force-disable-curses.patch 0014-fix-get-python-inc-output.patch 0015-dont-use-WINDOWS-def.patch - 0016-disable-SOVERSION-for-Android.patch - 0017-explicit-define-ctypes_pythonapi-for-Android.patch + 0017-disable-SOVERSION-for-Android.patch + 0018-explicit-define-ctypes_pythonapi-for-Android.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") From eb97247ab5156723c6ae254ed7c2f12e51565a1c Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 09:53:36 +0000 Subject: [PATCH 12/26] use vcpkg_cmake_get_vars to pick appropriate compiler --- ports/python3/portfile.cmake | 27 ++++++++++++++++++++++----- ports/python3/vcpkg.json | 5 +++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index e935dec3ea4606..8ccb0e4c22df9a 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -254,13 +254,30 @@ else() list(APPEND OPTIONS "--with-build-python=${_python_for_build}") if(VCPKG_TARGET_IS_ANDROID) - if(NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - set(VCPKG_CMAKE_SYSTEM_VERSION 29) + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + cmake_path(GET VCPKG_DETECTED_CMAKE_C_COMPILER PARENT_PATH llvm_dir) + + if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm") + set(clang_arch_prefix "armv7a") + elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") + set(clang_arch_prefix "aarch64") + elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86_64") + set(clang_arch_prefix "x86_64") + elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86") + set(clang_arch_prefix "i686") endif() + + if(DEFINED clang_arch_prefix) + set(clang_c_compiler ${llvm_dir}/${clang_arch_prefix}-linux-android29-clang) + else() + set(clang_c_compiler ${VCPKG_DETECTED_CMAKE_C_COMPILER}) + endif() + list(APPEND OPTIONS - "--build=x86_64-linux-gnu" - "CC=$ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${VCPKG_CMAKE_SYSTEM_VERSION}-clang" - "READELF=$ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-readelf" + "--build=${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu" + "CC=${clang_c_compiler}" + "READELF=${llvm_dir}/llvm-readelf" # For CONFIG_SITE property needed while cross-compile: https://docs.python.org/3/using/configure.html#cmdoption-arg-CONFIG_SITE "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=no" diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 892d81a4673d3e..64b771a8ecfcad 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -49,6 +49,11 @@ "host": true, "platform": "windows" }, + { + "name": "vcpkg-cmake-get-vars", + "host": true, + "platform": "android" + }, "zlib" ], "features": { From 02beb3bc56834b9071341474078dfff1002218fe Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 09:57:52 +0000 Subject: [PATCH 13/26] fix: use auto detected vars instead of magic number --- ports/python3/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 8ccb0e4c22df9a..2a7e8ffdd3cbd8 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -269,7 +269,7 @@ else() endif() if(DEFINED clang_arch_prefix) - set(clang_c_compiler ${llvm_dir}/${clang_arch_prefix}-linux-android29-clang) + set(clang_c_compiler ${llvm_dir}/${clang_arch_prefix}-linux-android${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}-clang) else() set(clang_c_compiler ${VCPKG_DETECTED_CMAKE_C_COMPILER}) endif() From f2cdc843ce8c5cdbaa9e8a1627e42fd55ed05697 Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 10:33:53 +0000 Subject: [PATCH 14/26] add port-version:2 --- ports/python3/vcpkg.json | 10 +++++----- versions/baseline.json | 2 +- versions/p-/python3.json | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 64b771a8ecfcad..af8c92f9f5917e 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.11.4", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", @@ -45,14 +45,14 @@ "platform": "!(windows & static)" }, { - "name": "vcpkg-msbuild", + "name": "vcpkg-cmake-get-vars", "host": true, - "platform": "windows" + "platform": "android" }, { - "name": "vcpkg-cmake-get-vars", + "name": "vcpkg-msbuild", "host": true, - "platform": "android" + "platform": "windows" }, "zlib" ], diff --git a/versions/baseline.json b/versions/baseline.json index 9367b24908569e..2bed133ffb327d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6602,7 +6602,7 @@ }, "python3": { "baseline": "3.11.4", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.5", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index c1d1dd5fd5b456..5bc3d028f7f393 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "cfd71aa2a8099ff83e8385fc1907335fc75ef4a7", + "git-tree": "96b1084e19dcfec66e04273b5ba6bb3c404eea24", + "version": "3.11.4", + "port-version": 2 + }, + { + "git-tree": "531061b4485adebb80364473d227b0edf4ee8ed9", "version": "3.11.4", "port-version": 1 }, From dfee2f237dc3fe9fc83e0136772fa9c0e48af10e Mon Sep 17 00:00:00 2001 From: arlen Date: Thu, 10 Aug 2023 10:35:38 +0000 Subject: [PATCH 15/26] running ./vcpkg x-add-version --all --- versions/p-/python3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 5bc3d028f7f393..97959944a64904 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "96b1084e19dcfec66e04273b5ba6bb3c404eea24", + "git-tree": "ad3950810f1f6f7915ab90b6bad55693033cd68b", "version": "3.11.4", "port-version": 2 }, From c21ed1a1ce5cc033b2fdcc1f040b7a59ac63301f Mon Sep 17 00:00:00 2001 From: Arlen-LT Date: Thu, 10 Aug 2023 20:50:21 +0800 Subject: [PATCH 16/26] test CI --- ports/python3/portfile.cmake | 62 ++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 2a7e8ffdd3cbd8..8579f61938ae41 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -253,37 +253,37 @@ else() set(_python_for_build "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") list(APPEND OPTIONS "--with-build-python=${_python_for_build}") - if(VCPKG_TARGET_IS_ANDROID) - vcpkg_cmake_get_vars(cmake_vars_file) - include("${cmake_vars_file}") - cmake_path(GET VCPKG_DETECTED_CMAKE_C_COMPILER PARENT_PATH llvm_dir) - - if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm") - set(clang_arch_prefix "armv7a") - elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") - set(clang_arch_prefix "aarch64") - elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86_64") - set(clang_arch_prefix "x86_64") - elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86") - set(clang_arch_prefix "i686") - endif() - - if(DEFINED clang_arch_prefix) - set(clang_c_compiler ${llvm_dir}/${clang_arch_prefix}-linux-android${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}-clang) - else() - set(clang_c_compiler ${VCPKG_DETECTED_CMAKE_C_COMPILER}) - endif() - - list(APPEND OPTIONS - "--build=${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu" - "CC=${clang_c_compiler}" - "READELF=${llvm_dir}/llvm-readelf" - # For CONFIG_SITE property needed while cross-compile: https://docs.python.org/3/using/configure.html#cmdoption-arg-CONFIG_SITE - "ac_cv_file__dev_ptmx=yes" - "ac_cv_file__dev_ptc=no" - "ac_cv_buggy_getaddrinfo=no" - ) - endif() + # if(VCPKG_TARGET_IS_ANDROID) + # vcpkg_cmake_get_vars(cmake_vars_file) + # include("${cmake_vars_file}") + # cmake_path(GET VCPKG_DETECTED_CMAKE_C_COMPILER PARENT_PATH llvm_dir) + + # if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm") + # set(clang_arch_prefix "armv7a") + # elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") + # set(clang_arch_prefix "aarch64") + # elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86_64") + # set(clang_arch_prefix "x86_64") + # elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86") + # set(clang_arch_prefix "i686") + # endif() + + # if(DEFINED clang_arch_prefix) + # set(clang_c_compiler ${llvm_dir}/${clang_arch_prefix}-linux-android${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}-clang) + # else() + # set(clang_c_compiler ${VCPKG_DETECTED_CMAKE_C_COMPILER}) + # endif() + + # list(APPEND OPTIONS + # "--build=${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu" + # "CC=${clang_c_compiler}" + # "READELF=${llvm_dir}/llvm-readelf" + # # For CONFIG_SITE property needed while cross-compile: https://docs.python.org/3/using/configure.html#cmdoption-arg-CONFIG_SITE + # "ac_cv_file__dev_ptmx=yes" + # "ac_cv_file__dev_ptc=no" + # "ac_cv_buggy_getaddrinfo=no" + # ) + # endif() else() vcpkg_find_acquire_program(PYTHON3) list(APPEND OPTIONS "ac_cv_prog_PYTHON_FOR_REGEN=${PYTHON3}") From 610bf932595eb77f213431a7d125af171ab79586 Mon Sep 17 00:00:00 2001 From: arlen Date: Fri, 11 Aug 2023 03:15:50 +0000 Subject: [PATCH 17/26] test CI --- ports/python3/portfile.cmake | 71 +++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 8579f61938ae41..6e54b983cec90a 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,10 +18,15 @@ set(PATCHES 0012-force-disable-curses.patch 0014-fix-get-python-inc-output.patch 0015-dont-use-WINDOWS-def.patch - 0017-disable-SOVERSION-for-Android.patch - 0018-explicit-define-ctypes_pythonapi-for-Android.patch ) +if(VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_ANDROID) + list(APPEND PATCHES + 0017-disable-SOVERSION-for-Android.patch + 0018-explicit-define-ctypes_pythonapi-for-Android.patch + ) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES 0002-static-library.patch) endif() @@ -253,37 +258,37 @@ else() set(_python_for_build "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") list(APPEND OPTIONS "--with-build-python=${_python_for_build}") - # if(VCPKG_TARGET_IS_ANDROID) - # vcpkg_cmake_get_vars(cmake_vars_file) - # include("${cmake_vars_file}") - # cmake_path(GET VCPKG_DETECTED_CMAKE_C_COMPILER PARENT_PATH llvm_dir) - - # if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm") - # set(clang_arch_prefix "armv7a") - # elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") - # set(clang_arch_prefix "aarch64") - # elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86_64") - # set(clang_arch_prefix "x86_64") - # elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86") - # set(clang_arch_prefix "i686") - # endif() - - # if(DEFINED clang_arch_prefix) - # set(clang_c_compiler ${llvm_dir}/${clang_arch_prefix}-linux-android${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}-clang) - # else() - # set(clang_c_compiler ${VCPKG_DETECTED_CMAKE_C_COMPILER}) - # endif() - - # list(APPEND OPTIONS - # "--build=${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu" - # "CC=${clang_c_compiler}" - # "READELF=${llvm_dir}/llvm-readelf" - # # For CONFIG_SITE property needed while cross-compile: https://docs.python.org/3/using/configure.html#cmdoption-arg-CONFIG_SITE - # "ac_cv_file__dev_ptmx=yes" - # "ac_cv_file__dev_ptc=no" - # "ac_cv_buggy_getaddrinfo=no" - # ) - # endif() + if(VCPKG_TARGET_IS_ANDROID) + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + cmake_path(GET VCPKG_DETECTED_CMAKE_C_COMPILER PARENT_PATH llvm_dir) + + if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm") + set(clang_arch_prefix "armv7a") + elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") + set(clang_arch_prefix "aarch64") + elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86_64") + set(clang_arch_prefix "x86_64") + elseif(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "x86") + set(clang_arch_prefix "i686") + endif() + + if(DEFINED clang_arch_prefix) + set(clang_c_compiler ${llvm_dir}/${clang_arch_prefix}-linux-android${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}-clang) + else() + set(clang_c_compiler ${VCPKG_DETECTED_CMAKE_C_COMPILER}) + endif() + + list(APPEND OPTIONS + "--build=${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu" + "CC=${clang_c_compiler}" + "READELF=${llvm_dir}/llvm-readelf" + # For CONFIG_SITE property needed while cross-compile: https://docs.python.org/3/using/configure.html#cmdoption-arg-CONFIG_SITE + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=no" + "ac_cv_buggy_getaddrinfo=no" + ) + endif() else() vcpkg_find_acquire_program(PYTHON3) list(APPEND OPTIONS "ac_cv_prog_PYTHON_FOR_REGEN=${PYTHON3}") From 3548a4d4bc3600dad61b2f1dbf125898ecd865d8 Mon Sep 17 00:00:00 2001 From: arlen Date: Fri, 11 Aug 2023 03:16:23 +0000 Subject: [PATCH 18/26] add version --- versions/p-/python3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 97959944a64904..0044cffa050e33 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ad3950810f1f6f7915ab90b6bad55693033cd68b", + "git-tree": "c28167205a15fc724e076880b31f752eeada6263", "version": "3.11.4", "port-version": 2 }, From e839a298ec43b916ec797df28ac396dbf959d597 Mon Sep 17 00:00:00 2001 From: arlen Date: Fri, 11 Aug 2023 07:50:58 +0000 Subject: [PATCH 19/26] delete platform of vcpkg-cmake-get-vars --- ports/python3/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index af8c92f9f5917e..d2dc24d6fed4ae 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -46,8 +46,7 @@ }, { "name": "vcpkg-cmake-get-vars", - "host": true, - "platform": "android" + "host": true }, { "name": "vcpkg-msbuild", From baff5a7520d2de4db621f8af5faa5c1f3b9e9cd7 Mon Sep 17 00:00:00 2001 From: arlen Date: Fri, 11 Aug 2023 08:23:28 +0000 Subject: [PATCH 20/26] Revert "delete platform of vcpkg-cmake-get-vars" This reverts commit e839a298ec43b916ec797df28ac396dbf959d597. --- ports/python3/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index d2dc24d6fed4ae..af8c92f9f5917e 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -46,7 +46,8 @@ }, { "name": "vcpkg-cmake-get-vars", - "host": true + "host": true, + "platform": "android" }, { "name": "vcpkg-msbuild", From a2a35e381642631fcf997a78ccc201bf86a647cd Mon Sep 17 00:00:00 2001 From: HAOZHE LI Date: Fri, 11 Aug 2023 16:25:53 +0800 Subject: [PATCH 21/26] Update portfile.cmake --- ports/python3/portfile.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 6e54b983cec90a..2a7e8ffdd3cbd8 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,15 +18,10 @@ set(PATCHES 0012-force-disable-curses.patch 0014-fix-get-python-inc-output.patch 0015-dont-use-WINDOWS-def.patch + 0017-disable-SOVERSION-for-Android.patch + 0018-explicit-define-ctypes_pythonapi-for-Android.patch ) -if(VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_ANDROID) - list(APPEND PATCHES - 0017-disable-SOVERSION-for-Android.patch - 0018-explicit-define-ctypes_pythonapi-for-Android.patch - ) -endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES 0002-static-library.patch) endif() From 77d4cd11ebb1697f5e27e9f98b7b08b006c1360c Mon Sep 17 00:00:00 2001 From: arlen Date: Fri, 11 Aug 2023 09:02:31 +0000 Subject: [PATCH 22/26] overwrite versions --- versions/p-/python3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 0044cffa050e33..97959944a64904 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c28167205a15fc724e076880b31f752eeada6263", + "git-tree": "ad3950810f1f6f7915ab90b6bad55693033cd68b", "version": "3.11.4", "port-version": 2 }, From 1df1eba6441830d01d18730895aeb2809c1d1425 Mon Sep 17 00:00:00 2001 From: arlen Date: Fri, 11 Aug 2023 10:29:06 +0000 Subject: [PATCH 23/26] Revert "Update portfile.cmake" This reverts commit a2a35e381642631fcf997a78ccc201bf86a647cd. --- ports/python3/portfile.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 2a7e8ffdd3cbd8..6e54b983cec90a 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,10 +18,15 @@ set(PATCHES 0012-force-disable-curses.patch 0014-fix-get-python-inc-output.patch 0015-dont-use-WINDOWS-def.patch - 0017-disable-SOVERSION-for-Android.patch - 0018-explicit-define-ctypes_pythonapi-for-Android.patch ) +if(VCPKG_CROSSCOMPILING AND VCPKG_TARGET_IS_ANDROID) + list(APPEND PATCHES + 0017-disable-SOVERSION-for-Android.patch + 0018-explicit-define-ctypes_pythonapi-for-Android.patch + ) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES 0002-static-library.patch) endif() From 919fe6769bf5436a6ebcd7354ea33b6c906c9106 Mon Sep 17 00:00:00 2001 From: arlen Date: Fri, 11 Aug 2023 10:30:14 +0000 Subject: [PATCH 24/26] update git-tree --- versions/p-/python3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 97959944a64904..0044cffa050e33 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ad3950810f1f6f7915ab90b6bad55693033cd68b", + "git-tree": "c28167205a15fc724e076880b31f752eeada6263", "version": "3.11.4", "port-version": 2 }, From f2a060c86ca52fe971dda62a0f67fb8a4db38a37 Mon Sep 17 00:00:00 2001 From: arlen Date: Mon, 14 Aug 2023 09:42:24 +0000 Subject: [PATCH 25/26] fix patch --- .../0018-explicit-define-ctypes_pythonapi-for-Android.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/python3/0018-explicit-define-ctypes_pythonapi-for-Android.patch b/ports/python3/0018-explicit-define-ctypes_pythonapi-for-Android.patch index 245ceac2373f89..88d6777b90e83b 100644 --- a/ports/python3/0018-explicit-define-ctypes_pythonapi-for-Android.patch +++ b/ports/python3/0018-explicit-define-ctypes_pythonapi-for-Android.patch @@ -6,7 +6,7 @@ diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py pythonapi = PyDLL("python dll", None, _sys.dllhandle) elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) -+elif hasattr(sys, 'getandroidapilevel'): ++elif hasattr(_sys, 'getandroidapilevel'): + pythonapi = PyDLL("libpython%d.%d.so" % _sys.version_info[:2]) else: pythonapi = PyDLL(None) From 16328722ecba5c0bf099a93f2741489b5fe9d134 Mon Sep 17 00:00:00 2001 From: arlen Date: Mon, 14 Aug 2023 09:43:25 +0000 Subject: [PATCH 26/26] update git-tree --- versions/p-/python3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 0044cffa050e33..d1406b067e14dd 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c28167205a15fc724e076880b31f752eeada6263", + "git-tree": "96df607e3b806c6c3c877804e3a0ed2dbf1af00a", "version": "3.11.4", "port-version": 2 },