pypy{,3}: Bump to 7.3.10

This commit is contained in:
Tee KOBAYASHI 2022-12-14 16:53:33 +09:00 committed by Uchiha Kakashi
parent 4966c9c539
commit 0004bdf0fa
4 changed files with 16 additions and 18 deletions

View File

@ -3,10 +3,9 @@ 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.9
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=7.3.10
TERMUX_PKG_SRCURL=https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2
TERMUX_PKG_SHA256=39b0972956f6548ce5828019dbae12503c32d6cbe91a2becf88d3e42cc52197b
TERMUX_PKG_SHA256=35e2cf4519cb51c4d5ffb4493ee24f0c7f42b4b04944903ca4b33981a04a3bc5
TERMUX_PKG_DEPENDS="gdbm, libandroid-posix-semaphore, libandroid-support, libbz2, libcrypt, libexpat, libffi, liblzma, libsqlite, libxml2, ncurses, ncurses-ui-libs, openssl, readline, zlib"
TERMUX_PKG_BUILD_DEPENDS="binutils, clang, dash, make, ndk-multilib, pkg-config, python2, tk, xorgproto"
TERMUX_PKG_RECOMMENDS="clang, make, pkg-config"

View File

@ -41,7 +41,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7.
raise ValueError('unknown sys.platform "%s"', sys.platform)
+# Android always requires compiling with -fPIC
+host_factory = LinuxPIC
+host_factory = Linux
platform = host = host_factory()
def pick_platform(new_platform, cc):
@ -69,7 +69,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7.
--- pypy3.7-v7.3.7-src/rpython/translator/platform/termux.py 1970-01-01 08:00:00.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/rpython/translator/platform/termux.py 2022-03-10 16:49:35.071701000 +0800
@@ -0,0 +1,179 @@
+from rpython.translator.platform.linux import LinuxPIC
+from rpython.translator.platform.linux import Linux
+from rpython.translator.platform.posix import _run_subprocess, GnuMakefile
+from rpython.translator.platform import ExecutionResult, log
+import os
@ -103,11 +103,11 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7.
+ assert isinstance(rpath_flags, list)
+ return ["-Wl,-rpath=@TERMUX_PREFIX@/lib"] + rpath_flags
+
+class BaseTermux(LinuxPIC):
+ cflags = _update_cflags_for_termux(LinuxPIC.cflags)
+class BaseTermux(Linux):
+ cflags = _update_cflags_for_termux(Linux.cflags)
+ extra_libs = ()
+ link_flags = _update_link_flags_for_termux(LinuxPIC.link_flags)
+ rpath_flags = _update_rpath_flags(LinuxPIC.rpath_flags)
+ link_flags = _update_link_flags_for_termux(Linux.link_flags)
+ rpath_flags = _update_rpath_flags(Linux.rpath_flags)
+ available_includedirs = []
+ available_librarydirs = []
+

View File

@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A fast, compliant alternative implementation of Python 3
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@licy183"
_MAJOR_VERSION=3.8
TERMUX_PKG_VERSION=7.3.9
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=7.3.10
TERMUX_PKG_SRCURL=https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2
TERMUX_PKG_SHA256=5b5d9d9256f12a129af8384e2f581bdfab3bc0fbbe3a0a480d9c1d2e95490eb1
TERMUX_PKG_SHA256=218a1e062f17aba89f61bc398e8498f13c048b9fcf294343f5d9d56c3ac9b882
TERMUX_PKG_DEPENDS="gdbm, libandroid-posix-semaphore, libandroid-support, libbz2, libcrypt, libexpat, libffi, liblzma, libsqlite, libxml2, ncurses, ncurses-ui-libs, openssl, readline, zlib"
TERMUX_PKG_BUILD_DEPENDS="binutils, clang, dash, make, ndk-multilib, pkg-config, python2, tk, xorgproto"
TERMUX_PKG_RECOMMENDS="clang, make, pkg-config"

View File

@ -41,7 +41,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7.
raise ValueError('unknown sys.platform "%s"', sys.platform)
+# Android always requires compiling with -fPIC
+host_factory = LinuxPIC
+host_factory = Linux
platform = host = host_factory()
def pick_platform(new_platform, cc):
@ -69,7 +69,7 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7.
--- pypy3.7-v7.3.7-src/rpython/translator/platform/termux.py 1970-01-01 08:00:00.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/rpython/translator/platform/termux.py 2022-03-10 16:49:35.071701000 +0800
@@ -0,0 +1,179 @@
+from rpython.translator.platform.linux import LinuxPIC
+from rpython.translator.platform.linux import Linux
+from rpython.translator.platform.posix import _run_subprocess, GnuMakefile
+from rpython.translator.platform import ExecutionResult, log
+import os
@ -103,11 +103,11 @@ diff -uNr pypy2.7-v7.3.6-src/rpython/translator/platform/__init__.py pypy2.7-v7.
+ assert isinstance(rpath_flags, list)
+ return ["-Wl,-rpath=@TERMUX_PREFIX@/lib"] + rpath_flags
+
+class BaseTermux(LinuxPIC):
+ cflags = _update_cflags_for_termux(LinuxPIC.cflags)
+class BaseTermux(Linux):
+ cflags = _update_cflags_for_termux(Linux.cflags)
+ extra_libs = ()
+ link_flags = _update_link_flags_for_termux(LinuxPIC.link_flags)
+ rpath_flags = _update_rpath_flags(LinuxPIC.rpath_flags)
+ link_flags = _update_link_flags_for_termux(Linux.link_flags)
+ rpath_flags = _update_rpath_flags(Linux.rpath_flags)
+ available_includedirs = []
+ available_librarydirs = []
+