pypy3: bump to 7.3.17

termux · Aug 29, 2024 · af3fd92 · af3fd92
1 parent 09b2c86
commit af3fd92
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/packages/pypy3/0005-fix-unavailable-functions.patch b/packages/pypy3/0005-fix-unavailable-functions.patch
@@ -155,7 +155,7 @@
 
 --- a/rpython/rlib/rvmprof/cintf.py
 +++ b/rpython/rlib/rvmprof/cintf.py
-@@ -16,14 +16,14 @@
+@@ -18,16 +18,16 @@
  class VMProfPlatformUnsupported(Exception):
      pass
 
@@ -165,19 +165,22 @@
 -if sys.platform in ('darwin', 'linux', 'linux2') or sys.platform.startswith('freebsd'):
 -    try:
 -        proc = detect_cpu.autodetect()
--        IS_SUPPORTED = proc.startswith('x86') or proc == 'aarch64'
+-        IS_SUPPORTED = (proc.startswith('x86')
+-                        or proc == 'aarch64'
+-                        or proc == 'riscv64')
 -    except detect_cpu.ProcessorAutodetectError:
 -        print("PROCESSOR NOT DETECTED, SKIPPING VMPROF")
 +# if sys.platform in ('darwin', 'linux', 'linux2') or sys.platform.startswith('freebsd'):
 +#     try:
 +#         proc = detect_cpu.autodetect()
-+#         IS_SUPPORTED = proc.startswith('x86') or proc == 'aarch64'
++#         IS_SUPPORTED = (proc.startswith('x86')
++#                         or proc == 'aarch64'
++#                         or proc == 'riscv64')
 +#     except detect_cpu.ProcessorAutodetectError:
 +#         print("PROCESSOR NOT DETECTED, SKIPPING VMPROF")
 
  ROOT = py.path.local(rpythonroot).join('rpython', 'rlib', 'rvmprof')
  SRC = ROOT.join('src')
-
 --- a/pypy/module/posix/moduledef.py
 +++ b/pypy/module/posix/moduledef.py
 @@ -140,12 +140,12 @@

diff --git a/packages/pypy3/0010-dummy-cpu_count.patch → packages/pypy3/0009-dummy-cpu_count.patch b/packages/pypy3/0010-dummy-cpu_count.patch → packages/pypy3/0009-dummy-cpu_count.patch
diff --git a/packages/pypy3/0010-do-not-try-to-get-L2-cache-on-Android.patch b/packages/pypy3/0010-do-not-try-to-get-L2-cache-on-Android.patch
@@ -0,0 +1,11 @@
+--- a/rpython/memory/gc/env.py
++++ b/rpython/memory/gc/env.py
+@@ -140,7 +140,7 @@
+         return get_L2cache_linux2_cpuinfo(label='L2 cache')
+     #if arch == 's390x':    untested
+     #    return get_L2cache_linux2_cpuinfo_s390x()
+-    if arch in ('ia64', 'aarch64'):
++    if arch in ('ia64', 'aarch64') and not os.access("/system/bin/app_process", os.F_OK):
+         return get_L2cache_linux2_system_cpu_index()
+     if arch in ('parisc', 'parisc64'):
+         return get_L2cache_linux2_cpuinfo(label='D-cache')
diff --git a/...shm-functions-for-posixshmem-module.patch → ...shm-functions-for-posixshmem-module.patch b/...shm-functions-for-posixshmem-module.patch → ...shm-functions-for-posixshmem-module.patch
diff --git a/packages/pypy3/build.sh b/packages/pypy3/build.sh
@@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://pypy.org
 TERMUX_PKG_DESCRIPTION="A fast, compliant alternative implementation of Python 3"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@licy183"
-_MAJOR_VERSION=3.9
-TERMUX_PKG_VERSION=7.3.15
-TERMUX_PKG_REVISION=2
+_MAJOR_VERSION=3.10
+TERMUX_PKG_VERSION=7.3.17
 TERMUX_PKG_SRCURL=https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2
-TERMUX_PKG_SHA256=6bb9537d85aa7ad13c0aad2e41ff7fd55080bc9b4d1361b8f502df51db816e18
+TERMUX_PKG_SHA256=6ad74bc578e9c6d3a8a1c51503313058e3c58c35df86f7485453c4be6ab24bf7
 TERMUX_PKG_DEPENDS="gdbm, libandroid-posix-semaphore, libandroid-support, libbz2, libcrypt, libexpat, libffi, liblzma, libsqlite, ncurses, ncurses-ui-libs, openssl, zlib"
 TERMUX_PKG_BUILD_DEPENDS="bionic-host, clang, make, pkg-config, python2, tk, xorgproto"
 TERMUX_PKG_RECOMMENDS="clang, make, pkg-config"