diff options
author | Pavel Vinogradov | 2021-10-05 04:40:13 -0400 |
---|---|---|
committer | Pavel Vinogradov | 2021-10-05 04:41:23 -0400 |
commit | 64a029c997fac9e4c99c2d41a369c1d733beae29 (patch) | |
tree | c8328415efc10b04df7b09f10799f30f54e3423f /devel | |
parent | d8deaa4dc6e4fcec5915eeaf20637a42289a0614 (diff) |
devel/python3: version 3.10.0
Diffstat (limited to 'devel')
-rwxr-xr-x | devel/python3/DETAILS | 2 | ||||
-rw-r--r-- | devel/python3/HISTORY | 5 | ||||
-rwxr-xr-x | devel/python3/PREPARE | 1 | ||||
-rw-r--r-- | devel/python3/patches-3.10/disable-compileall.patch | 37 | ||||
-rw-r--r-- | devel/python3/patches-3.10/makefile.patch | 24 | ||||
-rw-r--r-- | devel/python3/patches-3.10/obj.patch | 20 | ||||
-rw-r--r-- | devel/python3/python.gpg | bin | 32627 -> 37650 bytes |
7 files changed, 89 insertions, 0 deletions
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS index 353e7238e8..3938c01825 100755 --- a/devel/python3/DETAILS +++ b/devel/python3/DETAILS @@ -1,6 +1,8 @@ SPELL=python3 case "$PYTHON3_BRANCH" in devel| \ + 3.10) + VERSION=3.10.0 ;; stable| \ 3.9) VERSION=3.9.7 ;; diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY index 80d86683bb..21768d32e9 100644 --- a/devel/python3/HISTORY +++ b/devel/python3/HISTORY @@ -1,3 +1,8 @@ +2021-10-05 Pavel Vinogradov <public@sourcemage.org> + * DETAILS, PREPARE, patches-3.10/*: version 3.10.0 + * python.gpg: added new key: 64E628F8D684696D, + Pablo Galindo Salgado <pablogsal@gmail.com> + 2021-08-31 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 3.9.7 diff --git a/devel/python3/PREPARE b/devel/python3/PREPARE index c10165e5c6..80ed04e29f 100755 --- a/devel/python3/PREPARE +++ b/devel/python3/PREPARE @@ -2,6 +2,7 @@ prepare_select_branch \ stable \ devel \ + 3.10 \ 3.9 \ 3.8 \ 3.7 \ diff --git a/devel/python3/patches-3.10/disable-compileall.patch b/devel/python3/patches-3.10/disable-compileall.patch new file mode 100644 index 0000000000..4ef08d1ca7 --- /dev/null +++ b/devel/python3/patches-3.10/disable-compileall.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1456,33 +1456,6 @@ + $(DESTDIR)$(LIBDEST)/distutils/tests ; \ + fi + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ +- -j0 -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt diff --git a/devel/python3/patches-3.10/makefile.patch b/devel/python3/patches-3.10/makefile.patch new file mode 100644 index 0000000000..953baee9f3 --- /dev/null +++ b/devel/python3/patches-3.10/makefile.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -722,7 +722,10 @@ + + + Programs/_testembed: Programs/_testembed.o $(LIBRARY_DEPS) +- $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) ++ $(CC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) ++ ++ ############################################################################ ++ # Importlib + + ############################################################################ + # Importlib +@@ -802,7 +805,7 @@ + $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c + + Programs/_testembed.o: $(srcdir)/Programs/_testembed.c +- $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c ++ $(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c + + Modules/_sre.o: $(srcdir)/Modules/_sre.c $(srcdir)/Modules/sre.h $(srcdir)/Modules/sre_constants.h $(srcdir)/Modules/sre_lib.h + diff --git a/devel/python3/patches-3.10/obj.patch b/devel/python3/patches-3.10/obj.patch new file mode 100644 index 0000000000..c4e3ec328e --- /dev/null +++ b/devel/python3/patches-3.10/obj.patch @@ -0,0 +1,20 @@ +--- a/Include/object.h 2020-10-05 17:07:58.000000000 +0200 ++++ b/Include/object.h 2020-10-06 12:08:17.444833331 +0200 +@@ -127,7 +127,7 @@ + static inline int _Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type) { + return ob->ob_type == type; + } +-#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST_CONST(ob), type) ++#define Py_IS_TYPE(ob, type) (_Py_IS_TYPE(_PyObject_CAST_CONST(ob), type)) + + static inline void _Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt) { + ob->ob_refcnt = refcnt; +@@ -630,7 +630,7 @@ + return ((flags & feature) != 0); + } + +-#define PyType_FastSubclass(type, flag) PyType_HasFeature(type, flag) ++#define PyType_FastSubclass(type, flag) (PyType_HasFeature(type, flag)) + + static inline int _PyType_Check(PyObject *op) { + return PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS); diff --git a/devel/python3/python.gpg b/devel/python3/python.gpg Binary files differindex 2c7aba4819..9e669a9b61 100644 --- a/devel/python3/python.gpg +++ b/devel/python3/python.gpg |