diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 02031dd17..01f89981c 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -16,12 +16,12 @@ PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PKG_NAME:=python3 # XXX: reset PKG_RELEASE to 1 only if Python's pip & setuptools versions have also bumped; # otherwise, keep bumping PKG_RELEASE -PKG_RELEASE:=8 +PKG_RELEASE:=9 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:=9229773be41ed144370f47f0f626a1579931f5a390f1e8e3853174d52edd64a9 +PKG_HASH:=cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da PKG_LICENSE:=PSF PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE diff --git a/lang/python/python3/files/python3-version.mk b/lang/python/python3/files/python3-version.mk index e1129215b..2990892e9 100644 --- a/lang/python/python3/files/python3-version.mk +++ b/lang/python/python3/files/python3-version.mk @@ -8,7 +8,7 @@ # Note: keep in sync with setuptools & pip PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=6 -PYTHON3_VERSION_MICRO:=2 +PYTHON3_VERSION_MICRO:=3 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) diff --git a/lang/python/python3/patches/008-fix-distutils-path-creation.patch b/lang/python/python3/patches/008-fix-distutils-path-creation.patch deleted file mode 100644 index 796c1a2e4..000000000 --- a/lang/python/python3/patches/008-fix-distutils-path-creation.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Lib/imp.py -+++ b/Lib/imp.py -@@ -203,8 +203,9 @@ def load_package(name, path): - extensions = (machinery.SOURCE_SUFFIXES[:] + - machinery.BYTECODE_SUFFIXES[:]) - for extension in extensions: -- path = os.path.join(path, '__init__'+extension) -- if os.path.exists(path): -+ init_path = os.path.join(path, '__init__'+extension) -+ if os.path.exists(init_path): -+ path = init_path - break - else: - raise ValueError('{!r} is not a package'.format(path)) diff --git a/lang/python/python3/patches/012-disable-wcsftime-detection.patch b/lang/python/python3/patches/012-disable-wcsftime-detection.patch deleted file mode 100644 index 8432ac2a7..000000000 --- a/lang/python/python3/patches/012-disable-wcsftime-detection.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -11271,7 +11271,7 @@ for ac_func in alarm accept4 setitimer g - sigtimedwait sigwait sigwaitinfo snprintf strftime strlcpy symlinkat sync \ - sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ - truncate uname unlinkat unsetenv utimensat utimes waitid waitpid wait3 wait4 \ -- wcscoll wcsftime wcsxfrm wmemcmp writev _getpty -+ wcscoll wcsxfrm wmemcmp writev _getpty - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"