diff options
| author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2020-04-29 10:57:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 10:57:13 +0200 |
| commit | c0ec2dfd558ddd230ecb69dd3c88ba5c65747f05 (patch) | |
| tree | 5e4de1774216900804b476ae11c8ea7f3b4a5c3c | |
| parent | baacda1b4aa89b0d450f58887f037fc53ef133a4 (diff) | |
| parent | dd5896c7c4781d0de560eca405ace75c4f67df9c (diff) | |
Merge pull request #11995 from jefferyto/python-2.7.18-openwrt-18.06
[openwrt-18.06] python: Update to 2.7.18, refresh patches
| -rw-r--r-- | lang/python/python-version.mk | 2 | ||||
| -rw-r--r-- | lang/python/python/Makefile | 2 | ||||
| -rw-r--r-- | lang/python/python/patches/001-enable-zlib.patch | 2 | ||||
| -rw-r--r-- | lang/python/python/patches/005-fix-bluetooth-support.patch | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lang/python/python-version.mk b/lang/python/python-version.mk index 2da2fa87b..1f2e38dc9 100644 --- a/lang/python/python-version.mk +++ b/lang/python/python-version.mk @@ -6,7 +6,7 @@ # PYTHON_VERSION:=2.7 -PYTHON_VERSION_MICRO:=17 +PYTHON_VERSION_MICRO:=18 PYTHON_SETUPTOOLS_PKG_RELEASE:=1 PYTHON_PIP_PKG_RELEASE:=1 diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile index e456e972c..6ad838909 100644 --- a/lang/python/python/Makefile +++ b/lang/python/python/Makefile @@ -16,7 +16,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) -PKG_HASH:=4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41 +PKG_HASH:=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 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/python/patches/001-enable-zlib.patch b/lang/python/python/patches/001-enable-zlib.patch index e85b53c8d..5802e99f6 100644 --- a/lang/python/python/patches/001-enable-zlib.patch +++ b/lang/python/python/patches/001-enable-zlib.patch @@ -17,4 +17,4 @@ Subject: [PATCH] enable zlib +zlib zlibmodule.c -lz # Interface to the Expat XML parser - # + # More information on Expat can be found at www.libexpat.org. diff --git a/lang/python/python/patches/005-fix-bluetooth-support.patch b/lang/python/python/patches/005-fix-bluetooth-support.patch index 5e6e34b3a..6448f63f0 100644 --- a/lang/python/python/patches/005-fix-bluetooth-support.patch +++ b/lang/python/python/patches/005-fix-bluetooth-support.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -7077,7 +7077,7 @@ sys/param.h sys/poll.h sys/random.h sys/ +@@ -7084,7 +7084,7 @@ sys/param.h sys/poll.h sys/random.h sys/ sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \ sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ @@ -9,7 +9,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -@@ -7299,6 +7299,24 @@ fi +@@ -7306,6 +7306,24 @@ fi fi @@ -36,7 +36,7 @@ do : --- a/configure.ac +++ b/configure.ac -@@ -1732,10 +1732,17 @@ sys/param.h sys/poll.h sys/random.h sys/ +@@ -1739,10 +1739,17 @@ sys/param.h sys/poll.h sys/random.h sys/ sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \ sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ |