Skip to content

Commit

Permalink
python3: Update to version 3.7.5
Browse files Browse the repository at this point in the history
setuptools: Updated to version 41.2.0
pip: Updated to version 19.2.3

Removed patches:
- 017: code was refactored
- 02{5,6,7,8}: those patches were backported from upstream and they are
included in 3.7.5

Refreshed patches

Signed-off-by: Josef Schlehofer <[email protected]>
  • Loading branch information
BKPepe committed Oct 21, 2019
1 parent d97f776 commit 0882737
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 456 deletions.
6 changes: 3 additions & 3 deletions lang/python/python3-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=7
PYTHON3_VERSION_MICRO:=4
PYTHON3_VERSION_MICRO:=5

PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)

PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
PYTHON3_PIP_PKG_RELEASE:=1

PYTHON3_SETUPTOOLS_VERSION:=40.8.0
PYTHON3_PIP_VERSION:=19.0.3
PYTHON3_SETUPTOOLS_VERSION:=41.2.0
PYTHON3_PIP_VERSION:=19.2.3
4 changes: 2 additions & 2 deletions lang/python/python3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ PYTHON_VERSION:=$(PYTHON3_VERSION)
PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)

PKG_NAME:=python3
PKG_RELEASE:=4
PKG_RELEASE:=1
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)

PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
PKG_HASH:=fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f
PKG_HASH:=e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94

PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>, Jeffery To <[email protected]>
PKG_LICENSE:=Python/2.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1391,6 +1391,7 @@ libinstall: build_all $(srcdir)/Modules/
@@ -1400,6 +1400,7 @@ libinstall: build_all $(srcdir)/Modules/
$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
$(DESTDIR)$(LIBDEST); \
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+ifeq (@COMPILE_ALL_TESTS@,yes)
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
@@ -1426,6 +1427,7 @@ libinstall: build_all $(srcdir)/Modules/
@@ -1435,6 +1436,7 @@ libinstall: build_all $(srcdir)/Modules/
$(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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -753,6 +753,16 @@ regen-all: regen-opcode regen-opcode-tar
@@ -754,6 +754,16 @@ regen-all: regen-opcode regen-opcode-tar
############################################################################
# Special rules for object files

Expand All @@ -17,7 +17,7 @@
Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(OBJECT_OBJS) \
$(PYTHON_OBJS) \
@@ -760,6 +770,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
@@ -761,6 +771,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(MODOBJS) \
$(srcdir)/Modules/getbuildinfo.c
$(CC) -c $(PY_CORE_CFLAGS) \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -15273,7 +15273,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
@@ -15246,7 +15246,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
$as_echo "$ABIFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
$as_echo_n "checking SOABI... " >&6; }
Expand All @@ -11,7 +11,7 @@

--- a/configure.ac
+++ b/configure.ac
@@ -4736,7 +4736,7 @@ AC_SUBST(SOABI)
@@ -4739,7 +4739,7 @@ AC_SUBST(SOABI)
AC_MSG_CHECKING(ABIFLAGS)
AC_MSG_RESULT($ABIFLAGS)
AC_MSG_CHECKING(SOABI)
Expand Down
8 changes: 4 additions & 4 deletions lang/python/python3/patches/016-adjust-config-paths.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
abi=sys.abiflags,
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1400,7 +1400,7 @@ libinstall: build_all $(srcdir)/Modules/
@@ -1409,7 +1409,7 @@ libinstall: build_all $(srcdir)/Modules/
esac; \
done; \
done
Expand All @@ -29,7 +29,7 @@
$(DESTDIR)$(LIBDEST); \
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
ifeq (@COMPILE_ALL_TESTS@,yes)
@@ -1545,7 +1545,7 @@ sharedinstall: sharedmods
@@ -1554,7 +1554,7 @@ sharedinstall: sharedmods
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
--root=$(DESTDIR)/
Expand All @@ -40,7 +40,7 @@
# Here are a couple of targets for MacOSX again, to install a full
--- a/configure
+++ b/configure
@@ -15292,7 +15292,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
@@ -15265,7 +15265,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
$as_echo "$LDVERSION" >&6; }


Expand All @@ -51,7 +51,7 @@
LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
--- a/configure.ac
+++ b/configure.ac
@@ -4753,7 +4753,7 @@ AC_MSG_RESULT($LDVERSION)
@@ -4756,7 +4756,7 @@ AC_MSG_RESULT($LDVERSION)

dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)
Expand Down
15 changes: 0 additions & 15 deletions lang/python/python3/patches/017_lib2to3_fix_pyc_search.patch

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 0882737

Please sign in to comment.