Skip to content

Commit

Permalink
python: Update to 2.7.17, refresh patches
Browse files Browse the repository at this point in the history
Patches already merged and so removed:
* 011-fix-ssl-build-use-have-npn.patch
* 019-bpo-36216-Add-check-for-characters-in-netloc-that-normalize-to-separators-openwrtGH-12216.patch
* 020-bpo-36216-Only-print-test-messages-when-verbose-openwrtGH-12291.patch
* 021-2.7-bpo-35121-prefix-dot-in-domain-for-proper-subdom.patch
* 022-bpo-30458-Disallow-control-chars-in-http-URLs-openwrtGH-13315.patch
* 023-bpo-35907-Avoid-file-reading-as-disallowing-the-unnecessary-URL-scheme-in-urllib-openwrtGH-11842.patch
* 027-bpo-38243-Escape-the-server-title-of-DocXMLRPCServer.patch
* 028-bpo-34155-Dont-parse-domains-containing-openwrtGH-13079.patch

Patches no longer necessary and so removed:
* 017_lib2to3_fix_pyc_search.patch

Signed-off-by: Jeffery To <[email protected]>
  • Loading branch information
jefferyto committed Oct 21, 2019
1 parent a8bf6a8 commit 83b300a
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 1,150 deletions.
10 changes: 5 additions & 5 deletions lang/python/python-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#

PYTHON_VERSION:=2.7
PYTHON_VERSION_MICRO:=16
PYTHON_VERSION_MICRO:=17

PYTHON_SETUPTOOLS_PKG_RELEASE:=3
PYTHON_PIP_PKG_RELEASE:=2
PYTHON_SETUPTOOLS_PKG_RELEASE:=1
PYTHON_PIP_PKG_RELEASE:=1

PYTHON_SETUPTOOLS_VERSION:=40.6.2
PYTHON_PIP_VERSION:=18.1
PYTHON_SETUPTOOLS_VERSION:=41.2.0
PYTHON_PIP_VERSION:=19.2.3
4 changes: 2 additions & 2 deletions lang/python/python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ include ../python-version.mk

PKG_NAME:=python
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_RELEASE:=11
PKG_RELEASE:=1

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

PKG_LICENSE:=Python/2.0
PKG_LICENSE_FILES:=LICENSE Doc/copyright.rst Doc/license.rst Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Modules/expat/COPYING
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -497,7 +497,8 @@ class PyBuildExt(build_ext):
@@ -543,7 +543,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(dir_list, directory)

if os.path.normpath(sys.prefix) != '/usr' \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1127,6 +1127,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
@@ -1133,6 +1133,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
done; \
done
$(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 ; \
@@ -1153,6 +1154,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
@@ -1159,6 +1160,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
$(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
Expand Up @@ -3,7 +3,7 @@
@@ -71,7 +71,7 @@ int Py_InteractiveFlag; /* Needed by Py_
int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
int Py_NoSiteFlag; /* Suppress 'import site' */
int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
int Py_BytesWarningFlag; /* Warn on comparison between bytearray and unicode */
-int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
+int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */
int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -454,13 +454,8 @@ class PyBuildExt(build_ext):
@@ -500,13 +500,8 @@ class PyBuildExt(build_ext):
os.unlink(tmpfile)

def detect_modules(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/setup.py
+++ b/setup.py
@@ -1083,6 +1083,7 @@ class PyBuildExt(build_ext):
@@ -1129,6 +1129,7 @@ class PyBuildExt(build_ext):
if db_setup_debug: print "db lib: ", dblib, "not found"

except db_found:
+ rt_dblib_dir = None if cross_compiling else dblib_dir
if db_setup_debug:
print "bsddb using BerkeleyDB lib:", db_ver, dblib
print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
@@ -1097,7 +1098,7 @@ class PyBuildExt(build_ext):
@@ -1143,7 +1144,7 @@ class PyBuildExt(build_ext):
exts.append(Extension('_bsddb', ['_bsddb.c'],
depends = ['bsddb.h'],
library_dirs=dblib_dir,
Expand All @@ -17,7 +17,7 @@
include_dirs=db_incs,
libraries=dblibs))
else:
@@ -1308,10 +1309,11 @@ class PyBuildExt(build_ext):
@@ -1354,10 +1355,11 @@ class PyBuildExt(build_ext):
break
elif cand == "bdb":
if db_incs is not None:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -463,8 +463,9 @@ class PyBuildExt(build_ext):
@@ -509,8 +509,9 @@ class PyBuildExt(build_ext):
# directly since an inconsistently reproducible issue comes up where
# the environment variable is not set even though the value were passed
# into configure and stored in the Makefile (issue found on OS X 10.3).
Expand Down
20 changes: 0 additions & 20 deletions lang/python/python/patches/011-fix-ssl-build-use-have-npn.patch

This file was deleted.

15 changes: 0 additions & 15 deletions lang/python/python/patches/017_lib2to3_fix_pyc_search.patch

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 83b300a

Please sign in to comment.