Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pypy3: bump to 7.3.15 #21052

Merged
merged 1 commit into from
Aug 11, 2024
Merged

pypy3: bump to 7.3.15 #21052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions packages/pypy3/0003-fix-hardcoded-paths.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
diff -uNr pypy3.7-v7.3.7-src/lib-python/3/aifc.py pypy3.7-v7.3.7-src.mod/lib-python/3/aifc.py
--- pypy3.7-v7.3.7-src/lib-python/3/aifc.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/aifc.py 2022-01-17 23:55:55.258202300 +0800
--- a/lib-python/3/aifc.py
+++ b/lib-python/3/aifc.py
@@ -928,7 +928,7 @@
if __name__ == '__main__':
import sys
Expand All @@ -11,9 +10,8 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/aifc.py pypy3.7-v7.3.7-src.mod/lib-pyt
with open(fn, 'r') as f:
print("Reading", fn)

diff -uNr pypy3.7-v7.3.7-src/lib-python/3/mailcap.py pypy3.7-v7.3.7-src.mod/lib-python/3/mailcap.py
--- pypy3.7-v7.3.7-src/lib-python/3/mailcap.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/mailcap.py 2022-01-17 23:59:02.757448900 +0800
--- a/lib-python/3/mailcap.py
+++ b/lib-python/3/mailcap.py
@@ -55,7 +55,8 @@
# Don't bother with getpwuid()
home = '.' # Last resort
Expand All @@ -25,9 +23,8 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/mailcap.py pypy3.7-v7.3.7-src.mod/lib-



diff -uNr pypy3.7-v7.3.7-src/lib-python/3/mimetypes.py pypy3.7-v7.3.7-src.mod/lib-python/3/mimetypes.py
--- pypy3.7-v7.3.7-src/lib-python/3/mimetypes.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/mimetypes.py 2022-01-18 00:02:08.526252600 +0800
--- a/lib-python/3/mimetypes.py
+++ b/lib-python/3/mimetypes.py
@@ -49,6 +49,7 @@
"/usr/local/lib/netscape/mime.types",
"/usr/local/etc/httpd/conf/mime.types", # Apache 1.2
Expand All @@ -37,9 +34,8 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/mimetypes.py pypy3.7-v7.3.7-src.mod/li

inited = False

diff -uNr pypy3.7-v7.3.7-src/lib-python/3/subprocess.py pypy3.7-v7.3.7-src.mod/lib-python/3/subprocess.py
--- pypy3.7-v7.3.7-src/lib-python/3/subprocess.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/subprocess.py 2022-01-17 22:27:32.546765900 +0800
--- a/lib-python/3/subprocess.py
+++ b/lib-python/3/subprocess.py
@@ -1452,9 +1452,7 @@
args = list(args)

Expand All @@ -52,9 +48,8 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/subprocess.py pypy3.7-v7.3.7-src.mod/l
if executable:
args[0] = executable

diff -uNr pypy3.7-v7.3.7-src/lib-python/3/tempfile.py pypy3.7-v7.3.7-src.mod/lib-python/3/tempfile.py
--- pypy3.7-v7.3.7-src/lib-python/3/tempfile.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/tempfile.py 2022-01-17 22:43:01.156251700 +0800
--- a/lib-python/3/tempfile.py
+++ b/lib-python/3/tempfile.py
@@ -173,7 +173,7 @@
_os.path.expandvars(r'%SYSTEMROOT%\Temp'),
r'c:\temp', r'c:\tmp', r'\temp', r'\tmp' ])
Expand All @@ -65,7 +60,6 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/tempfile.py pypy3.7-v7.3.7-src.mod/lib
# As a last resort, the current directory.
try:

diff -uNr a/lib-python/3/uuid.py b/lib-python/3/uuid.py
--- a/lib-python/3/uuid.py
+++ b/lib-python/3/uuid.py
@@ -361,7 +361,7 @@
Expand All @@ -78,9 +72,8 @@ diff -uNr a/lib-python/3/uuid.py b/lib-python/3/uuid.py
if executable is None:
return None

diff -uNr pypy3.7-v7.3.7-src/lib-python/3/posixpath.py pypy3.7-v7.3.7-src.mod/lib-python/3/posixpath.py
--- pypy3.7-v7.3.7-src/lib-python/3/posixpath.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/posixpath.py 2022-01-18 00:05:03.938325200 +0800
--- a/lib-python/3/posixpath.py
+++ b/lib-python/3/posixpath.py
@@ -18,7 +18,7 @@
extsep = '.'
sep = '/'
Expand All @@ -90,15 +83,27 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/posixpath.py pypy3.7-v7.3.7-src.mod/li
altsep = None
devnull = '/dev/null'

diff -uNr pypy3.8-v7.3.8-src/lib-python/3/multiprocessing/heap.py pypy3.8-v7.3.8-src.mod/lib-python/3/multiprocessing/heap.py
--- pypy3.8-v7.3.8-src/lib-python/3/multiprocessing/heap.py 2022-03-17 19:52:44.711182400 +0800
+++ pypy3.8-v7.3.8-src.mod/lib-python/3/multiprocessing/heap.py 2022-03-20 11:42:23.287141000 +0800
--- a/lib-python/3/multiprocessing/heap.py
+++ b/lib-python/3/multiprocessing/heap.py
@@ -70,7 +70,7 @@
"""

if sys.platform == 'linux':
- _dir_candidates = ['/dev/shm']
+ _dir_candidates = []
+ _dir_candidates = ['/dev/shm']
else:
_dir_candidates = []

--- a/lib_pypy/_tkinter/tklib_build.py
+++ b/lib_pypy/_tkinter/tklib_build.py
@@ -26,6 +26,10 @@
if homebrew:
incdirs.append(homebrew + '/include')
libdirs.append(homebrew + '/opt/tcl-tk/lib')
+elif os.path.exists("@TERMUX_PREFIX@"):
+ incdirs = ["@TERMUX_PREFIX@/include"]
+ libdirs = ["@TERMUX_PREFIX@/lib"]
+ linklibs = ['tcl8.6', 'tk8.6']
else:
# On some Linux distributions, the tcl and tk libraries are
# stored in /usr/include, so we must check this case also
30 changes: 12 additions & 18 deletions packages/pypy3/0004-fix-loaded-libs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
diff -U 1 -Nr pypy2.7-v7.3.6-src/lib_pypy/_audioop_build.py pypy2.7-v7.3.6-src.mod/lib_pypy/_audioop_build.py
--- pypy2.7-v7.3.6-src/lib_pypy/_audioop_build.py 2021-10-03 14:36:11.000000000 +0800
+++ pypy2.7-v7.3.6-src.mod/lib_pypy/_audioop_build.py 2022-01-16 19:42:48.828092300 +0800
--- a/lib_pypy/_audioop_build.py
+++ b/lib_pypy/_audioop_build.py
@@ -629,3 +629,3 @@

-ffi.set_source("_audioop_cffi", C_SOURCE)
+ffi.set_source("_audioop_cffi", C_SOURCE, libraries=["m"])

diff -U 1 -Nr pypy2.7-v7.3.6-src/lib_pypy/_syslog_build.py pypy2.7-v7.3.6-src.mod/lib_pypy/_syslog_build.py
--- pypy3.7-v7.3.7-src/lib_pypy/_syslog_build.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib_pypy/_syslog_build.py 2022-01-18 13:15:23.250151600 +0800
--- a/lib_pypy/_syslog_build.py
+++ b/lib_pypy/_syslog_build.py
@@ -23,7 +23,7 @@
#ifndef LOG_NEWS
#define LOG_NEWS LOG_MAIL
Expand All @@ -20,9 +18,8 @@ diff -U 1 -Nr pypy2.7-v7.3.6-src/lib_pypy/_syslog_build.py pypy2.7-v7.3.6-src.mo
/* mandatory constants */


diff -uNr pypy2.7-v7.3.6-src/lib_pypy/_dbm.py pypy2.7-v7.3.6-src.mod/lib_pypy/_dbm.py
--- pypy2.7-v7.3.6-src/lib_pypy/_dbm.py 2021-10-03 14:36:11.000000000 +0800
+++ pypy2.7-v7.3.6-src.mod/lib_pypy/_dbm.py 2022-02-09 09:35:04.548269800 +0800
--- a/lib_pypy/_dbm.py
+++ b/lib_pypy/_dbm.py
@@ -123,7 +123,9 @@
func.restype = restype

Expand All @@ -36,9 +33,8 @@ diff -uNr pypy2.7-v7.3.6-src/lib_pypy/_dbm.py pypy2.7-v7.3.6-src.mod/lib_pypy/_d
for c in ['5.3', '5.2', '5.1', '5.0', '4.9', '4.8', '4.7', '4.6', '4.5']:


diff -uNr pypy3.6-v7.3.2-src/pypy/module/_multiprocessing/interp_semaphore.py pypy3.6-v7.3.2-src.mod/pypy/module/_multiprocessing/interp_semaphore.py
--- pypy3.6-v7.3.2-src/pypy/module/_multiprocessing/interp_semaphore.py 2020-09-23 15:02:22.000000000 +0800
+++ pypy3.6-v7.3.2-src.mod/pypy/module/_multiprocessing/interp_semaphore.py 2021-11-08 05:33:39.436884700 +0800
--- a/pypy/module/_multiprocessing/interp_semaphore.py
+++ b/pypy/module/_multiprocessing/interp_semaphore.py
@@ -43,7 +43,7 @@
if sys.platform == 'darwin':
libraries = []
Expand All @@ -49,9 +45,8 @@ diff -uNr pypy3.6-v7.3.2-src/pypy/module/_multiprocessing/interp_semaphore.py py
eci = ExternalCompilationInfo(
includes = ['sys/time.h',

diff -uNr pypy3.7-v7.3.7-src/rpython/rlib/rposix.py pypy3.7-v7.3.7-src.mod/rpython/rlib/rposix.py
--- pypy3.7-v7.3.7-src/rpython/rlib/rposix.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/rpython/rlib/rposix.py 2022-02-12 18:32:05.555262500 +0800
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -212,7 +212,7 @@
includes.append('sys/sysmacros.h')
if sys.platform.startswith('freebsd') or sys.platform.startswith('openbsd'):
Expand All @@ -72,9 +67,8 @@ diff -uNr pypy3.7-v7.3.7-src/rpython/rlib/rposix.py pypy3.7-v7.3.7-src.mod/rpyth
if not _WIN32:
class CConfig:

diff -uNr pypy3.6-v7.3.2-src/rpython/rlib/rtime.py pypy3.6-v7.3.2-src.mod/rpython/rlib/rtime.py
--- pypy3.6-v7.3.2-src/rpython/rlib/rtime.py 2020-09-23 15:02:22.000000000 +0800
+++ pypy3.6-v7.3.2-src.mod/rpython/rlib/rtime.py 2021-11-08 05:33:04.074015000 +0800
--- a/rpython/rlib/rtime.py
+++ b/rpython/rlib/rtime.py
@@ -29,10 +29,6 @@
'sys/types.h', 'unistd.h',
'sys/time.h', 'sys/resource.h']
Expand Down
58 changes: 40 additions & 18 deletions packages/pypy3/0005-fix-unavailable-functions.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
diff -uNr pypy3.7-v7.3.7-src/lib-python/3/http/server.py pypy3.7-v7.3.7-src.mod/lib-python/3/http/server.py
--- pypy3.7-v7.3.7-src/lib-python/3/http/server.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/http/server.py 2022-01-18 00:16:44.328899400 +0800
--- a/lib-python/3/http/server.py
+++ b/lib-python/3/http/server.py
@@ -1161,10 +1161,6 @@
return
# Child
Expand All @@ -13,9 +12,8 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/http/server.py pypy3.7-v7.3.7-src.mod/
os.dup2(self.wfile.fileno(), 1)
os.execve(scriptfile, args, env)

diff -uNr pypy3.6-v7.3.2-src/lib_pypy/_pwdgrp_build.py pypy3.6-v7.3.2-src.mod/lib_pypy/_pwdgrp_build.py
--- pypy3.6-v7.3.2-src/lib_pypy/_pwdgrp_build.py 2020-09-23 15:02:22.000000000 +0800
+++ pypy3.6-v7.3.2-src.mod/lib_pypy/_pwdgrp_build.py 2021-11-09 18:32:36.933096400 +0800
--- a/lib_pypy/_pwdgrp_build.py
+++ b/lib_pypy/_pwdgrp_build.py
@@ -35,9 +35,9 @@
struct passwd *getpwuid(uid_t uid);
struct passwd *getpwnam(const char *name);
Expand All @@ -30,9 +28,8 @@ diff -uNr pypy3.6-v7.3.2-src/lib_pypy/_pwdgrp_build.py pypy3.6-v7.3.2-src.mod/li
struct group *getgrgid(gid_t gid);
struct group *getgrnam(const char *name);

diff -uNr pypy3.7-v7.3.7-src/lib-python/3/smtpd.py pypy3.7-v7.3.7-src.mod/lib-python/3/smtpd.py
--- pypy3.7-v7.3.7-src/lib-python/3/smtpd.py 2021-10-24 22:07:11.000000000 +0800
+++ pypy3.7-v7.3.7-src.mod/lib-python/3/smtpd.py 2022-01-18 00:18:09.630517000 +0800
--- a/lib-python/3/smtpd.py
+++ b/lib-python/3/smtpd.py
@@ -9,7 +9,8 @@
-n
This program generally tries to setuid `nobody', unless this flag is
Expand All @@ -54,9 +51,8 @@ diff -uNr pypy3.7-v7.3.7-src/lib-python/3/smtpd.py pypy3.7-v7.3.7-src.mod/lib-py
enable_SMTPUTF8 = False


diff -uNr pypy3.6-v7.3.2-src/pypy/module/pwd/interp_pwd.py pypy3.6-v7.3.2-src.mod/pypy/module/pwd/interp_pwd.py
--- pypy3.6-v7.3.2-src/pypy/module/pwd/interp_pwd.py 2020-09-23 15:02:22.000000000 +0800
+++ pypy3.6-v7.3.2-src.mod/pypy/module/pwd/interp_pwd.py 2022-01-09 05:13:04.669185900 +0800
--- a/pypy/module/pwd/interp_pwd.py
+++ b/pypy/module/pwd/interp_pwd.py
@@ -19,18 +19,25 @@
uid_t = config['uid_t']
gid_t = config['gid_t']
Expand Down Expand Up @@ -141,9 +137,8 @@ diff -uNr pypy3.6-v7.3.2-src/pypy/module/pwd/interp_pwd.py pypy3.6-v7.3.2-src.mo
+# c_endpwent()
+# return space.newlist(users_w)

diff -uNr pypy3.6-v7.3.2-src/pypy/module/pwd/moduledef.py pypy3.6-v7.3.2-src.mod/pypy/module/pwd/moduledef.py
--- pypy3.6-v7.3.2-src/pypy/module/pwd/moduledef.py 2020-09-23 15:02:22.000000000 +0800
+++ pypy3.6-v7.3.2-src.mod/pypy/module/pwd/moduledef.py 2021-11-09 18:31:05.132729100 +0800
--- a/pypy/module/pwd/moduledef.py
+++ b/pypy/module/pwd/moduledef.py
@@ -15,11 +15,11 @@
interpleveldefs = {
'getpwuid': 'interp_pwd.getpwuid',
Expand All @@ -158,9 +153,8 @@ diff -uNr pypy3.6-v7.3.2-src/pypy/module/pwd/moduledef.py pypy3.6-v7.3.2-src.mod
+ # 'struct_pwent': 'app_pwd.struct_passwd',
}

diff -uNr pypy3.7-v7.3.7-src/rpython/rlib/rvmprof/cintf.py pypy3.7-v7.3.7-src.mod/rpython/rlib/rvmprof/cintf.py
--- pypy3.7-v7.3.7-src/rpython/rlib/rvmprof/cintf.py 2022-01-02 01:09:08.909941000 +0800
+++ pypy3.7-v7.3.7-src.mod/rpython/rlib/rvmprof/cintf.py 2022-01-02 01:10:11.909941000 +0800
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -16,14 +16,14 @@
class VMProfPlatformUnsupported(Exception):
pass
Expand All @@ -184,3 +178,31 @@ diff -uNr pypy3.7-v7.3.7-src/rpython/rlib/rvmprof/cintf.py pypy3.7-v7.3.7-src.mo
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 @@
interpleveldefs['pathconf_names'] = 'space.wrap(interp_posix.pathconf_names())'
if hasattr(os, 'pathconf'):
interpleveldefs['pathconf'] = 'interp_posix.pathconf'
- if hasattr(os, 'confstr'):
+ if False:
interpleveldefs['confstr'] = 'interp_posix.confstr'
interpleveldefs['confstr_names'] = 'space.wrap(interp_posix.confstr_names())'
if hasattr(os, 'ttyname'):
interpleveldefs['ttyname'] = 'interp_posix.ttyname'
- if hasattr(os, 'getloadavg'):
+ if False:
interpleveldefs['getloadavg'] = 'interp_posix.getloadavg'
if hasattr(os, 'makedev'):
interpleveldefs['makedev'] = 'interp_posix.makedev'
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -3049,7 +3049,7 @@
# ____________________________________________________________
# Support for *xattr functions

-if sys.platform.startswith('linux'):
+if False:

class CConfig:
_compilation_info_ = ExternalCompilationInfo(
5 changes: 2 additions & 3 deletions packages/pypy3/0006-package-zip.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
diff -uNr pypy3.6-v7.3.2-src/pypy/tool/release/package.py pypy3.6-v7.3.2-src.mod/pypy/tool/release/package.py
--- pypy3.6-v7.3.2-src/pypy/tool/release/package.py 2020-09-23 15:02:22.000000000 +0800
+++ pypy3.6-v7.3.2-src.mod/pypy/tool/release/package.py 2021-12-30 23:25:59.068175100 +0800
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -35,7 +35,7 @@
ARCH = get_arch()

Expand Down
Loading