diff --git a/packages/pypy/0005-fix-unavailable-functions.patch b/packages/pypy/0005-fix-unavailable-functions.patch index af96f7fadd..33138e6396 100644 --- a/packages/pypy/0005-fix-unavailable-functions.patch +++ b/packages/pypy/0005-fix-unavailable-functions.patch @@ -139,19 +139,17 @@ --- a/rpython/rlib/rvmprof/cintf.py +++ b/rpython/rlib/rvmprof/cintf.py -@@ -18,16 +18,16 @@ - class VMProfPlatformUnsupported(Exception): - pass - --# vmprof works only on x86 for now -+# vmprof cannot compile on termux due to no dlinfo on Bionic Libc +@@ -21,15 +21,15 @@ + # vmprof works only on x86 for now IS_SUPPORTED = False + NATIVE_PROFILING_SUPPORTED = False -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' - or proc == 'riscv64') +- NATIVE_PROFILING_SUPPORTED = proc.startswith('x86') - except detect_cpu.ProcessorAutodetectError: - print("PROCESSOR NOT DETECTED, SKIPPING VMPROF") +# if sys.platform in ('darwin', 'linux', 'linux2') or sys.platform.startswith('freebsd'): @@ -160,6 +158,7 @@ +# IS_SUPPORTED = (proc.startswith('x86') +# or proc == 'aarch64' +# or proc == 'riscv64') ++# NATIVE_PROFILING_SUPPORTED = proc.startswith('x86') +# except detect_cpu.ProcessorAutodetectError: +# print("PROCESSOR NOT DETECTED, SKIPPING VMPROF") diff --git a/packages/pypy/0011-set-_FILE_OFFSET_BITS-to-64-on-arm.patch b/packages/pypy/0011-set-_FILE_OFFSET_BITS-to-64-on-arm.patch new file mode 100644 index 0000000000..4f7bed7176 --- /dev/null +++ b/packages/pypy/0011-set-_FILE_OFFSET_BITS-to-64-on-arm.patch @@ -0,0 +1,11 @@ +--- a/rpython/translator/c/src/precommondefs.h ++++ b/rpython/translator/c/src/precommondefs.h +@@ -11,7 +11,7 @@ + /* Define on Darwin to activate all library features */ + #define _DARWIN_C_SOURCE 1 + /* These must be set to 64 to enable large file support on 32-bit systems. */ +-#if defined(i386) || defined(__i386__) || defined(__i386) || defined(_M_IX86) ++#if defined(i386) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(__arm__) + #define _FILE_OFFSET_BITS 64 + #define _LARGEFILE_SOURCE 1 + #endif diff --git a/packages/pypy/build.sh b/packages/pypy/build.sh index 89dc3b086e..dcbec530c6 100644 --- a/packages/pypy/build.sh +++ b/packages/pypy/build.sh @@ -3,13 +3,17 @@ TERMUX_PKG_DESCRIPTION="A fast, compliant alternative implementation of Python" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@licy183" _MAJOR_VERSION=2.7 -TERMUX_PKG_VERSION="7.3.17" -TERMUX_PKG_SRCURL=(https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2 - https://downloads.python.org/pypy/pypy2.7-v$TERMUX_PKG_VERSION-linux64.tar.bz2 - https://downloads.python.org/pypy/pypy2.7-v$TERMUX_PKG_VERSION-linux32.tar.bz2) -TERMUX_PKG_SHA256=(50e06840f4bbde91448080a4118068a89b8fbcae25ff8da1e2bb1402dc9a0346 - 9f3497f87b3372d17e447369e0016a4bec99a6b4d2a59aba774a25bfe4353474 - a3aa0867cc837a34941047ece0fbb6ca190410fae6ad35fae4999d03bf178750) +TERMUX_PKG_VERSION="7.3.18" +TERMUX_PKG_SRCURL=( + https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2 + https://downloads.python.org/pypy/pypy2.7-v$TERMUX_PKG_VERSION-linux64.tar.bz2 + https://downloads.python.org/pypy/pypy2.7-v$TERMUX_PKG_VERSION-linux32.tar.bz2 +) +TERMUX_PKG_SHA256=( + 737435ddfc5afa5b97a7209c87d70d5f1062426c053b9bb8b99a0347cb4891fa + 1da34354e5fa59400609e94c00ba6feccf5aa575abb26fb6caf9c2ac16100ff4 + 54990fb1ae2266c260a7ce694b84ab91a8d0d298da440cd5695ac671dc5615e2 +) TERMUX_PKG_AUTO_UPDATE=true 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, tk, xorgproto" @@ -88,6 +92,7 @@ termux_step_make() { -b $HOME -b $TERMUX_PKG_TMPDIR -b /proc -b /dev -b /sys +-b $TERMUX_PREFIX/opt/bionic-host:/system -w $TERMUX_PKG_TMPDIR -r / "