-From e568f4deb7c648e3265154574db753601636cdda Mon Sep 17 00:00:00 2001
+From 586a67bb448290a98df45e9f61d803952d2aa761 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 16:21:31 -0800
Subject: [PATCH] Make the build of pyc files conditional
2 files changed, 8 insertions(+)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 82e830727e..b38bd79121 100644
+index 502317aa0c..f9011c132a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1395,6 +1395,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
+@@ -1455,6 +1455,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
+ifeq (@PYC_BUILD@,yes)
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
-@@ -1422,6 +1423,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
+ -j0 -d $(LIBDEST) -f \
+@@ -1482,6 +1483,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST)/site-packages -f \
+ -j0 -d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+endif
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
diff --git a/configure.ac b/configure.ac
-index 962006704f..a76b5444df 100644
+index a189d42c2c..4690cdba9f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1107,6 +1107,12 @@ fi
+@@ -1085,6 +1085,12 @@ fi
AC_MSG_CHECKING(LDLIBRARY)
# library that we build, but we do not want to link against it (we
# will find it with a -framework option). For this reason there is an
--
-2.13.5
+2.20.1
-From 8ec1677d16bef6d6ee5cee4ff004dfa3d0428e88 Mon Sep 17 00:00:00 2001
+From 3b558cfb1670300afece09b957e1e4b7072bce6b Mon Sep 17 00:00:00 2001
From: Vanya Sergeev <vsergeev@gmail.com>
Date: Wed, 23 Dec 2015 11:30:33 +0100
Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index a76b5444df..5f87c4db5a 100644
+index 4690cdba9f..ffeec102b7 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -4056,7 +4056,7 @@ fi
+@@ -4059,7 +4059,7 @@ fi
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
if test $ipv6 = yes
then
--
-2.13.5
+2.20.1
-From 2c2afc80831c518e5daf3df6c9e4c4ac0a7be001 Mon Sep 17 00:00:00 2001
+From 36c138c15515e80f72a570b61da324e55ae3e80c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 16:33:22 -0800
Subject: [PATCH] Add infrastructure to disable the build of certain extensions
---
Makefile.pre.in | 6 +++++-
configure.ac | 2 ++
- setup.py | 6 +++++-
- 3 files changed, 12 insertions(+), 2 deletions(-)
+ setup.py | 5 ++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index b38bd79121..4ce917ab8d 100644
+index f9011c132a..e8a6bd5c03 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -206,6 +206,8 @@ FILEMODE= 644
+@@ -205,6 +205,8 @@ FILEMODE= 644
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -619,6 +621,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -605,6 +607,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
esac; \
echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
-@@ -1528,7 +1531,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
+@@ -1601,7 +1604,8 @@ libainstall: @DEF_MAKE_RULE@ python-config
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
diff --git a/configure.ac b/configure.ac
-index 5f87c4db5a..d5ee2aedfb 100644
+index ffeec102b7..7872b4dfee 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2966,6 +2966,8 @@ LIBS="$withval $LIBS"
+@@ -2952,6 +2952,8 @@ LIBS="$withval $LIBS"
PKG_PROG_PKG_CONFIG
AC_MSG_CHECKING(for --with-system-expat)
AC_ARG_WITH(system_expat,
diff --git a/setup.py b/setup.py
-index fe477974bd..86643ae8bf 100644
+index 20d7f35652..d3f2cc1b37 100644
--- a/setup.py
+++ b/setup.py
-@@ -48,7 +48,11 @@ host_platform = get_platform()
- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+@@ -24,7 +24,10 @@ from distutils.spawn import find_executable
+ TEST_EXTENSIONS = True
# This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
+-DISABLED_MODULE_LIST = []
+try:
-+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
++ DISABLED_MODULE_LIST = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
+except KeyError:
-+ disabled_module_list = list()
-+
++ DISABLED_MODULE_LIST = list()
+
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (after any relative
+ def get_platform():
--
-2.13.5
+2.20.1
-From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001
+From f5ed27c9b9efb4756630e5799be14fefdc3b2702 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:33:14 +0100
Subject: [PATCH] Adjust library/header paths for cross-compilation
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
-index 74de782d8a..d0c847b365 100644
+index 2d7cdf063f..cba150075c 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -234,7 +234,10 @@ class build_ext(Command):
# building python standard extensions
self.library_dirs.append('.')
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 2bcd1dd288..422c13fa4f 100644
+index b51629eb94..011a437bcd 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -17,10 +17,17 @@ import sys
- from .errors import DistutilsPlatformError
+@@ -18,10 +18,17 @@ from .errors import DistutilsPlatformError
+ from .util import get_platform, get_host_platform
# These are needed in a couple of spots, so just compute them once.
-PREFIX = os.path.normpath(sys.prefix)
# Path to the base directory of the project. On Windows the binary may
# live in project/PCbuild/win32 or project/PCbuild/amd64.
--
-2.13.5
+2.20.1
-From 01b588baf835ec95df7c5696eff1f6c07eaa1108 Mon Sep 17 00:00:00 2001
+From 5bcb991a8de2f1b9bdf44e78894417ed2ee137a5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:36:00 +0100
Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
-index 86643ae8bf..cd00fbdbda 100644
+index d3f2cc1b37..5d504d7638 100644
--- a/setup.py
+++ b/setup.py
-@@ -894,12 +894,9 @@ class PyBuildExt(build_ext):
+@@ -955,12 +955,9 @@ class PyBuildExt(build_ext):
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
-- elif self.compiler.find_library_file(lib_dirs +
+- elif self.compiler.find_library_file(self.lib_dirs +
- ['/usr/lib/termcap'],
- 'termcap'):
-+ elif self.compiler.find_library_file(lib_dirs, 'termcap'):
++ elif self.compiler.find_library_file(self.lib_dirs, 'termcap'):
readline_libs.append('termcap')
- exts.append( Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs) )
+ self.add(Extension('readline', ['readline.c'],
+- library_dirs=['/usr/lib/termcap'],
+ extra_link_args=readline_extra_link_args,
+ libraries=readline_libs))
else:
--
-2.13.5
+2.20.1
-From 9055171433d5f6beae90815e8c075dc1e0938936 Mon Sep 17 00:00:00 2001
+From b878b174e12a5cb2e1943f1f79d94033c1ee80d7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:36:27 +0100
Subject: [PATCH] Don't add multiarch paths
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index cd00fbdbda..c956fa08d1 100644
+index 5d504d7638..282a592dc6 100644
--- a/setup.py
+++ b/setup.py
-@@ -591,10 +591,10 @@ class PyBuildExt(build_ext):
- if not cross_compiling:
+@@ -654,10 +654,10 @@ class PyBuildExt(build_ext):
+ if not CROSS_COMPILING:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ self.add_multiarch_paths()
# only change this for cross builds for 3.3, issues on Mageia
- if cross_compiling:
- self.add_gcc_paths()
+ if CROSS_COMPILING:
+ self.add_cross_compiling_paths()
- self.add_multiarch_paths()
+ self.add_ldflags_cppflags()
- # Add paths specified in the environment variables LDFLAGS and
- # CPPFLAGS for header and library files.
+ def init_inc_lib_dirs(self):
--
-2.13.5
+2.20.1
-From 63ab4a20076740bd39985c7dee3d6231cdc74c75 Mon Sep 17 00:00:00 2001
+From fceda5bae52571213b6671ce0220d1a85b38f8c7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:43:24 +0100
Subject: [PATCH] Abort on failed module build
1 file changed, 1 insertion(+)
diff --git a/setup.py b/setup.py
-index c956fa08d1..b3add2be76 100644
+index 282a592dc6..8fda3b4d47 100644
--- a/setup.py
+++ b/setup.py
-@@ -402,6 +402,7 @@ class PyBuildExt(build_ext):
+@@ -444,6 +444,7 @@ class PyBuildExt(build_ext):
print("Failed to build these modules:")
print_three_column(failed)
print()
if self.failed_on_import:
failed = self.failed_on_import[:]
--
-2.13.5
+2.20.1
-From 20767cb868ff271f4501a6e023f367400882d75e Mon Sep 17 00:00:00 2001
+From 91e8058cf9085795db64f43e2c9548926ea46ab0 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 23 Dec 2015 11:44:02 +0100
Subject: [PATCH] Serial ioctl() workaround
1 file changed, 2 insertions(+)
diff --git a/Modules/termios.c b/Modules/termios.c
-index b78d33e688..58b0444565 100644
+index aee7f12c57..ba2ff77d06 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -15,7 +15,9 @@
+#undef TIOCTTYGSTRUCT
/* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
- * MDTR, MRI, and MRTS (appearantly used internally by some things
+ * MDTR, MRI, and MRTS (apparently used internally by some things
--
-2.13.5
+2.20.1
-From 8869b15c754ae615203b65a99e043f56770bacd5 Mon Sep 17 00:00:00 2001
+From 3ec9bbf5bd9cced0005c99d7d65997b119abf2f6 Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
Date: Wed, 23 Dec 2015 11:44:30 +0100
Subject: [PATCH] Do not adjust the shebang of Python scripts for
self.build_dir)
updated_files.append(outfile)
--
-2.13.5
+2.20.1
-From da3880edac19100f69891f225cc2f07a82be1e52 Mon Sep 17 00:00:00 2001
+From 7b3839bcf9f79988fb944cd65717839cde166cb8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Thu, 20 Nov 2014 13:24:59 +0100
Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
-index d1d3275..9e259c0 100644
+index 2602fe24c0..a1bc3cd5f7 100644
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
@@ -24,18 +24,19 @@ installed_prefix ()
VERSION="@VERSION@"
LIBM="@LIBM@"
LIBC="@LIBC@"
-@@ -48,7 +49,7 @@ OPT="@OPT@"
+@@ -49,7 +50,7 @@ OPT="@OPT@"
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
LDVERSION="@LDVERSION@"
LIBDEST=${prefix_real}/lib/python${VERSION}
PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
--
-2.14.3
+2.20.1
-From 660ea434ad8f921db74c0e3f93aa3ff5daac44f3 Mon Sep 17 00:00:00 2001
+From a9affe1f3f98342b682848c9b3f862ee194ff625 Mon Sep 17 00:00:00 2001
From: Samuel Cabrero <samuelcabrero@gmail.com>
Date: Wed, 23 Dec 2015 11:45:48 +0100
Subject: [PATCH] Override system locale and set to default when adding gcc
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index b3add2be76..29bfd174d2 100644
+index 8fda3b4d47..bb7eb44213 100644
--- a/setup.py
+++ b/setup.py
-@@ -558,7 +558,7 @@ class PyBuildExt(build_ext):
- tmpfile = os.path.join(self.build_temp, 'gccpaths')
+@@ -600,7 +600,7 @@ class PyBuildExt(build_ext):
+ tmpfile = os.path.join(self.build_temp, 'ccpaths')
if not os.path.exists(self.build_temp):
os.makedirs(self.build_temp)
-- ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-+ ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
+- ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
++ ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
is_gcc = False
+ is_clang = False
in_incdirs = False
- inc_dirs = []
--
-2.13.5
+2.20.1
-From 9db508467be41bc35f06c0076c855b99a1519d24 Mon Sep 17 00:00:00 2001
+From c50b8e7fb9b2e61d4d195a055cd1bbf993cc455f Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
Date: Wed, 22 Feb 2017 16:48:49 -0800
Subject: [PATCH] Add importlib fix for PEP 3147 issue
[ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
- Lib/importlib/_bootstrap_external.py | 38 +++++-------------------------------
- 1 file changed, 5 insertions(+), 33 deletions(-)
+ Lib/importlib/_bootstrap_external.py | 44 ++++------------------------
+ 1 file changed, 5 insertions(+), 39 deletions(-)
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
-index 9feec50842..3550013d58 100644
+index b8ac482994..db034f605a 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
-@@ -283,8 +283,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+@@ -306,8 +306,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
a True value is the same as setting 'optimization' to the empty string
while a False value is equivalent to setting 'optimization' to '1'.
"""
if debug_override is not None:
_warnings.warn('the debug_override parameter is deprecated; use '
-@@ -296,10 +294,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+@@ -319,10 +317,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
path = _os.fspath(path)
head, tail = _path_split(path)
base, sep, rest = tail.rpartition('.')
if optimization is None:
if sys.flags.optimize == 0:
optimization = ''
-@@ -310,40 +305,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
- if not optimization.isalnum():
- raise ValueError('{!r} is not alphanumeric'.format(optimization))
- almost_filename = '{}.{}{}'.format(almost_filename, _OPT, optimization)
-- return _path_join(head, _PYCACHE, almost_filename + BYTECODE_SUFFIXES[0])
-+ return _path_join(head, almost_filename + BYTECODE_SUFFIXES[0])
+@@ -359,46 +354,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+ head.lstrip(path_separators),
+ filename,
+ )
+- return _path_join(head, _PYCACHE, filename)
++ return _path_join(head, filename)
def source_from_cache(path):
- raise NotImplementedError('sys.implementation.cache_tag is None')
- path = _os.fspath(path)
- head, pycache_filename = _path_split(path)
-- head, pycache = _path_split(head)
-- if pycache != _PYCACHE:
-- raise ValueError('{} not bottom-level directory in '
-- '{!r}'.format(_PYCACHE, path))
+- found_in_pycache_prefix = False
+- if sys.pycache_prefix is not None:
+- stripped_path = sys.pycache_prefix.rstrip(path_separators)
+- if head.startswith(stripped_path + path_sep):
+- head = head[len(stripped_path):]
+- found_in_pycache_prefix = True
+- if not found_in_pycache_prefix:
+- head, pycache = _path_split(head)
+- if pycache != _PYCACHE:
+- raise ValueError(f'{_PYCACHE} not bottom-level directory in '
+- f'{path!r}')
- dot_count = pycache_filename.count('.')
- if dot_count not in {2, 3}:
-- raise ValueError('expected only 2 or 3 dots in '
-- '{!r}'.format(pycache_filename))
+- raise ValueError(f'expected only 2 or 3 dots in {pycache_filename!r}')
- elif dot_count == 3:
- optimization = pycache_filename.rsplit('.', 2)[-2]
- if not optimization.startswith(_OPT):
- raise ValueError("optimization portion of filename does not start "
-- "with {!r}".format(_OPT))
+- f"with {_OPT!r}")
- opt_level = optimization[len(_OPT):]
- if not opt_level.isalnum():
-- raise ValueError("optimization level {!r} is not an alphanumeric "
-- "value".format(optimization))
+- raise ValueError(f"optimization level {optimization!r} is not an "
+- "alphanumeric value")
- base_filename = pycache_filename.partition('.')[0]
+ head, filename = _path_split(path)
+ base_filename = filename.partition('.')[0]
--
-2.13.5
+2.20.1
-From bba0896a05e6406076893dd2f4c3b330e41082a6 Mon Sep 17 00:00:00 2001
+From 5ee3e5ad62919c431b1f7b5ff91ddf606582df0e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 17:01:18 -0800
Subject: [PATCH] Add an option to disable installation of test modules
[ Andrey Smirnov: ported to Python 3.6 ]
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
- Makefile.pre.in | 55 ++++++++++++++++++++++++++++++++++++-------------------
+ Makefile.pre.in | 54 ++++++++++++++++++++++++++++++++-----------------
configure.ac | 5 +++++
- 2 files changed, 41 insertions(+), 19 deletions(-)
+ 2 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 4ce917ab8d..4110fff4ac 100644
+index e8a6bd5c03..3abee36f49 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1261,8 +1261,28 @@ maninstall: altmaninstall
+@@ -1317,8 +1317,28 @@ maninstall: altmaninstall
# Install the library
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
+ tkinter/test/test_ttk test \
test/audiodata \
test/capath test/data \
- test/cjkencodings test/decimaltestdata test/xmltestdata \
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 1ff2362..194dbfc 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1336,26 +1336,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
- test/test_importlib/source \
+ test/cjkencodings test/decimaltestdata \
+@@ -1376,26 +1396,24 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
test/test_importlib/zipdata01 \
test/test_importlib/zipdata02 \
+ test/ziptestdata \
- asyncio \
test/test_asyncio \
- collections concurrent concurrent/futures encodings \
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
diff --git a/configure.ac b/configure.ac
-index d5ee2aedfb..f924937fe1 100644
+index 7872b4dfee..b820d18c7c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3226,6 +3226,11 @@ if test "$posix_threads" = "yes"; then
+@@ -3213,6 +3213,11 @@ if test "$posix_threads" = "yes"; then
AC_CHECK_FUNCS(pthread_getcpuclockid)
fi
# Check for enable-ipv6
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
--
-2.13.5
+2.20.1
-From 18a754e930e03d143d9392e49174cc370b334cdd Mon Sep 17 00:00:00 2001
+From 13a8be57e79f2657c75391bfa524dc1ba4993b02 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 17:07:56 -0800
Subject: [PATCH] Add an option to disable pydoc
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 4110fff4ac..badb2af35d 100644
+index 3abee36f49..6fa0549a56 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1231,7 +1231,9 @@ bininstall: altbininstall
+@@ -1289,7 +1289,9 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
+endif
-rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
- -rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1279,7 +1281,7 @@ LIBSUBDIRS= tkinter site-packages \
+ if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
+@@ -1335,7 +1337,7 @@ LIBSUBDIRS= tkinter site-packages \
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/common venv/scripts/posix \
TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
tkinter/test/test_ttk test \
-@@ -1354,6 +1356,10 @@ ifeq (@TEST_MODULES@,yes)
+@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
diff --git a/configure.ac b/configure.ac
-index f924937fe1..1621fa1611 100644
+index b820d18c7c..f53cc86d89 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3226,6 +3226,12 @@ if test "$posix_threads" = "yes"; then
+@@ -3213,6 +3213,12 @@ if test "$posix_threads" = "yes"; then
AC_CHECK_FUNCS(pthread_getcpuclockid)
fi
AC_ARG_ENABLE(test-modules,
diff --git a/setup.py b/setup.py
-index 29bfd174d2..94dd337fef 100644
+index bb7eb44213..748c269960 100644
--- a/setup.py
+++ b/setup.py
-@@ -2376,6 +2376,12 @@ def main():
+@@ -2401,6 +2401,12 @@ def main():
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2400,8 +2406,7 @@ def main():
+@@ -2425,8 +2431,7 @@ def main():
# If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in
- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
-- "Tools/scripts/2to3", "Tools/scripts/pyvenv"]
+- "Tools/scripts/2to3"]
+ scripts = scripts
)
# --install-platlib
--
-2.13.5
+2.20.1
-From c2d279b4a19de7a32e8a73e320423f699d408380 Mon Sep 17 00:00:00 2001
+From 868823f15bab031caf05dc5e8ce2eac076bfc82b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 17:15:31 -0800
Subject: [PATCH] Add an option to disable lib2to3
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index badb2af35d..931cc3ed07 100644
+index 6fa0549a56..3e1f130532 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1235,7 +1235,9 @@ ifeq (@PYDOC@,yes)
+@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
endif
-rm -f $(DESTDIR)$(BINDIR)/2to3
+ifeq (@LIB2TO3@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
+endif
- -rm -f $(DESTDIR)$(BINDIR)/pyvenv
- (cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1272,7 +1274,6 @@ LIBSUBDIRS= tkinter site-packages \
+ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \
+@@ -1328,7 +1330,6 @@ LIBSUBDIRS= tkinter site-packages \
html json http dbm xmlrpc \
sqlite3 \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1342,9 +1343,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+@@ -1402,9 +1403,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_email test/test_email/data \
test/test_json \
sqlite3/test \
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1352,6 +1350,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+@@ -1412,6 +1410,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_tools test/test_warnings test/test_warnings/data \
unittest/test unittest/test/testmock
ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
-@@ -1451,10 +1457,12 @@ ifeq (@PYC_BUILD@,yes)
- -d $(LIBDEST)/site-packages -f \
+@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes)
+ -j0 -d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
endif
+ifeq (@LIB2TO3@,yes)
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
+endif
- python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
- @ # Substitution happens here, as the completely-expanded BINDIR
+ # bpo-21536: Misc/python-config.sh is generated in the build directory
+ # from $(srcdir)Misc/python-config.sh.in.
diff --git a/configure.ac b/configure.ac
-index 1621fa1611..13b2edf8b7 100644
+index f53cc86d89..caa8eaf88a 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3238,6 +3238,12 @@ AC_ARG_ENABLE(test-modules,
+@@ -3225,6 +3225,12 @@ AC_ARG_ENABLE(test-modules,
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
diff --git a/setup.py b/setup.py
-index 94dd337fef..76429e1326 100644
+index 748c269960..1669797cad 100644
--- a/setup.py
+++ b/setup.py
-@@ -2377,10 +2377,11 @@ def main():
+@@ -2402,10 +2402,11 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
setup(# PyPI Metadata (PEP 301)
name = "Python",
--
-2.13.5
+2.20.1
-From f2965dfb1aa4f6b3216f3bb1d20f99326f127079 Mon Sep 17 00:00:00 2001
+From 1a1d13a973d9dcbd6660bfef40cf35c7638f779b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 17:20:45 -0800
Subject: [PATCH] Add option to disable the sqlite3 module
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 931cc3ed07..a1ce0712cd 100644
+index 3e1f130532..cf9add0bc7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1272,7 +1272,6 @@ LIBSUBDIRS= tkinter site-packages \
+@@ -1328,7 +1328,6 @@ LIBSUBDIRS= tkinter site-packages \
email email/mime \
ensurepip ensurepip/_bundled \
html json http dbm xmlrpc \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
-@@ -1342,7 +1341,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+@@ -1402,7 +1401,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_asyncio \
test/test_email test/test_email/data \
test/test_json \
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1358,6 +1356,11 @@ TESTSUBDIRS += lib2to3/tests \
+@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests \
lib2to3/tests/data/fixers/myfixes
endif
LIBSUBDIRS += $(TESTSUBDIRS)
endif
diff --git a/configure.ac b/configure.ac
-index 13b2edf8b7..d7582cfea4 100644
+index caa8eaf88a..79a8255f44 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3226,6 +3226,15 @@ if test "$posix_threads" = "yes"; then
+@@ -3213,6 +3213,15 @@ if test "$posix_threads" = "yes"; then
AC_CHECK_FUNCS(pthread_getcpuclockid)
fi
AC_ARG_ENABLE(pydoc,
--
-2.13.5
+2.20.1
-From f96a00d42e714171f1d90501ed73594fddee570f Mon Sep 17 00:00:00 2001
+From c54cb57b3bd80fa2819f6409d5d2b98d82fbfcb2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 17:23:42 -0800
Subject: [PATCH] Add an option to disable the tk module
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a1ce0712cd..dc1e917cc3 100644
+index cf9add0bc7..5d78419fd4 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1266,7 +1266,7 @@ maninstall: altmaninstall
+@@ -1322,7 +1322,7 @@ maninstall: altmaninstall
# Install the library
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
asyncio \
collections concurrent concurrent/futures encodings \
email email/mime \
-@@ -1283,8 +1283,7 @@ LIBSUBDIRS= tkinter site-packages \
+@@ -1339,8 +1339,7 @@ LIBSUBDIRS= tkinter site-packages \
venv venv/scripts venv/scripts/common venv/scripts/posix \
curses
+TESTSUBDIRS= test \
test/audiodata \
test/capath test/data \
- test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1348,6 +1347,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
+ test/cjkencodings test/decimaltestdata \
+@@ -1408,6 +1407,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
test/test_tools test/test_warnings test/test_warnings/data \
unittest/test unittest/test/testmock
LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
TESTSUBDIRS += lib2to3/tests \
diff --git a/configure.ac b/configure.ac
-index d7582cfea4..6a56a5b0c1 100644
+index 79a8255f44..b5922451cc 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3235,6 +3235,15 @@ if test "$SQLITE3" = "no" ; then
+@@ -3222,6 +3222,15 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
AC_ARG_ENABLE(pydoc,
--
-2.13.5
+2.20.1
-From 404aad42698c6d5cbd78421720f9a2bc0e8ec9fe Mon Sep 17 00:00:00 2001
+From 332373ca25f2dbe5473330666ec49143506a4dc0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 17:31:51 -0800
Subject: [PATCH] Add an option to disable the curses module
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index dc1e917cc3..6a6bc082cd 100644
+index 5d78419fd4..660c292765 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1280,8 +1280,7 @@ LIBSUBDIRS= site-packages \
+@@ -1336,8 +1336,7 @@ LIBSUBDIRS= site-packages \
turtledemo \
multiprocessing multiprocessing/dummy \
unittest \
TESTSUBDIRS= test \
test/audiodata \
-@@ -1353,6 +1352,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+@@ -1413,6 +1412,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
tkinter/test/test_ttk
endif
LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
TESTSUBDIRS += lib2to3/tests \
diff --git a/configure.ac b/configure.ac
-index 6a56a5b0c1..5896b39ff9 100644
+index b5922451cc..ea422a86a9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3244,6 +3244,15 @@ if test "$TK" = "no"; then
+@@ -3231,6 +3231,15 @@ if test "$TK" = "no"; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
AC_ARG_ENABLE(pydoc,
--
-2.13.5
+2.20.1
-From 63fc5bc90cb57460552b544cbed0c2939759ab9e Mon Sep 17 00:00:00 2001
+From d88f2d3430bbbe285ae3de5fbc1bde34da7f0478 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Feb 2017 17:40:45 -0800
Subject: [PATCH] Add an option to disable expat
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 6a6bc082cd..dc4b92b6fe 100644
+index 660c292765..f49abf8395 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1275,7 +1275,7 @@ LIBSUBDIRS= site-packages \
+@@ -1331,7 +1331,7 @@ LIBSUBDIRS= site-packages \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
importlib \
turtledemo \
multiprocessing multiprocessing/dummy \
-@@ -1356,6 +1356,10 @@ ifeq (@CURSES@,yes)
+@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes)
LIBSUBDIRS += curses
endif
LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
TESTSUBDIRS += lib2to3/tests \
diff --git a/configure.ac b/configure.ac
-index 5896b39ff9..6f21482207 100644
+index ea422a86a9..3c1e2c088d 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2969,13 +2969,21 @@ PKG_PROG_PKG_CONFIG
+@@ -2955,13 +2955,21 @@ PKG_PROG_PKG_CONFIG
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
# Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi)
diff --git a/setup.py b/setup.py
-index 76429e1326..38aa5e605e 100644
+index 1669797cad..d2727c0da5 100644
--- a/setup.py
+++ b/setup.py
-@@ -1529,7 +1529,7 @@ class PyBuildExt(build_ext):
+@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext):
#
# More information on Expat can be found at www.libexpat.org.
#
define_macros = []
extra_compile_args = []
--
-2.13.5
+2.20.1
-From 3335500cb13a6bc1ab41dfcf00b33e6ade3b9764 Mon Sep 17 00:00:00 2001
+From 347f359b484c8e34b49f71132701252b966d93aa Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:49:55 +0100
Subject: [PATCH] Add an option to disable CJK codecs
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 6f21482207..c7742faf41 100644
+index 3c1e2c088d..30a92f9c2e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3243,6 +3243,12 @@ if test "$SQLITE3" = "no" ; then
+@@ -3230,6 +3230,12 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
--
-2.13.5
+2.20.1
-From e52d4868cc1192f7e1c147aebaf4fc6f7de30357 Mon Sep 17 00:00:00 2001
+From ff9bebed083c5d20fe31f94b868f6f1a8c6cc744 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:50:11 +0100
Subject: [PATCH] Add an option to disable NIS
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index c7742faf41..42a871bb09 100644
+index 30a92f9c2e..20f326db46 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3249,6 +3249,12 @@ AC_ARG_ENABLE(codecs-cjk,
+@@ -3236,6 +3236,12 @@ AC_ARG_ENABLE(codecs-cjk,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
fi])
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
--
-2.13.5
+2.20.1
-From 69d3e8f0438d01adde55e90eeabafa4abefd3b02 Mon Sep 17 00:00:00 2001
+From 47f9caca90e6c8c18736e5dfd0acf47aae27eefb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:50:27 +0100
Subject: [PATCH] Add an option to disable unicodedata
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 42a871bb09..1d610e132b 100644
+index 20f326db46..99bbc37b07 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3255,6 +3255,12 @@ AC_ARG_ENABLE(nis,
+@@ -3242,6 +3242,12 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
--
-2.13.5
+2.20.1
-From 5bbd94f014c89665d02a8a32442822ab7c5520d0 Mon Sep 17 00:00:00 2001
+From c3ad1d6fc8f1fa56ee0522389227454710bf7877 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 22 Feb 2017 17:45:14 -0800
Subject: [PATCH] Add an option to disable IDLE
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index dc4b92b6fe..3e43066d90 100644
+index f49abf8395..bc777e6504 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1229,7 +1229,9 @@ bininstall: altbininstall
- -rm -f $(DESTDIR)$(LIBPC)/python3.pc
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
+@@ -1287,7 +1287,9 @@ bininstall: altbininstall
+ -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc
+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc)
-rm -f $(DESTDIR)$(BINDIR)/idle3
+ifeq (@IDLE@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-@@ -1274,7 +1276,6 @@ LIBSUBDIRS= site-packages \
+@@ -1330,7 +1332,6 @@ LIBSUBDIRS= site-packages \
html json http dbm xmlrpc \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
distutils distutils/command \
importlib \
turtledemo \
-@@ -1360,6 +1361,10 @@ ifeq (@EXPAT@,yes)
+@@ -1420,6 +1421,10 @@ ifeq (@EXPAT@,yes)
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
TESTSUBDIRS += lib2to3/tests \
diff --git a/configure.ac b/configure.ac
-index 1d610e132b..2699e7ceb1 100644
+index 99bbc37b07..8c9706582e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3297,6 +3297,12 @@ AC_ARG_ENABLE(lib2to3,
+@@ -3284,6 +3284,12 @@ AC_ARG_ENABLE(lib2to3,
AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
diff --git a/setup.py b/setup.py
-index 38aa5e605e..d642825c1e 100644
+index d2727c0da5..9f09b3d985 100644
--- a/setup.py
+++ b/setup.py
-@@ -2377,11 +2377,13 @@ def main():
+@@ -2402,11 +2402,13 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
setup(# PyPI Metadata (PEP 301)
name = "Python",
--
-2.13.5
+2.20.1
-From 0870559b9af82b55f1fd8b35528510f563577256 Mon Sep 17 00:00:00 2001
+From c82efeabd2f9b89ff2ecd5261eceeeb3af022ae8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:51:31 +0100
Subject: [PATCH] Add an option to disable decimal
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 2699e7ceb1..e2c3b6f25c 100644
+index 8c9706582e..e6255babb6 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3020,13 +3020,20 @@ fi
+@@ -3006,13 +3006,20 @@ fi
AC_SUBST(LIBFFI_INCLUDEDIR)
# Check for use of the system libmpdec library
# Check for support for loadable sqlite extensions
AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
diff --git a/setup.py b/setup.py
-index d642825c1e..5b98255857 100644
+index 9f09b3d985..a7f2e23d87 100644
--- a/setup.py
+++ b/setup.py
-@@ -2054,7 +2054,7 @@ class PyBuildExt(build_ext):
- def _decimal_ext(self):
+@@ -2076,7 +2076,7 @@ class PyBuildExt(build_ext):
+ # Stefan Krah's _decimal module
extra_compile_args = []
undef_macros = []
- if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
libraries = [':libmpdec.so.2']
sources = ['_decimal/_decimal.c']
--
-2.13.5
+2.20.1
-From a04fb6159e394ec8346cd49993fdf70db3e1b184 Mon Sep 17 00:00:00 2001
+From c68234aba844cb1034fdcfb50aef03da454723f9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:51:58 +0100
Subject: [PATCH] Add an option to disable the ossaudiodev module
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index e2c3b6f25c..8e3dded25e 100644
+index e6255babb6..5809233aac 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3035,6 +3035,12 @@ else
+@@ -3021,6 +3021,12 @@ else
fi
AC_SUBST(MPDEC)
AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
AC_ARG_ENABLE(loadable-sqlite-extensions,
--
-2.13.5
+2.20.1
-From 4b001683ad1cb1d90b7c389e67447a250fa9c218 Mon Sep 17 00:00:00 2001
+From 8faf197969bf531279d5c59a5bb2bc3a21acc378 Mon Sep 17 00:00:00 2001
From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
Date: Wed, 22 Feb 2017 17:55:59 -0800
Subject: [PATCH] Add an option to disable openssl support.
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 8e3dded25e..28bcdabd67 100644
+index 5809233aac..6b09bafda4 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3274,6 +3274,12 @@ AC_ARG_ENABLE(unicodedata,
+@@ -3261,6 +3261,12 @@ AC_ARG_ENABLE(unicodedata,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
fi])
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
--
-2.13.5
+2.20.1
-From d35deaa5c65c29f2a56a29fd5fc1dadadd485eaf Mon Sep 17 00:00:00 2001
+From 6e3923f90497ba7230b62fdd3f2dca1cb79852bf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 7 Mar 2017 23:29:05 +0100
Subject: [PATCH] Add an option to disable the readline module
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 28bcdabd67..484f6ebaca 100644
+index 6b09bafda4..b64518eed5 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3280,6 +3280,12 @@ AC_ARG_ENABLE(openssl,
+@@ -3267,6 +3267,12 @@ AC_ARG_ENABLE(openssl,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
fi])
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
--
-2.13.5
+2.20.1
-From 9e95f88906f850caa789977dab4b0f256b575254 Mon Sep 17 00:00:00 2001
+From e6f44f93db96ed7f3b2baa0e09ea32a32c78c638 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 7 Mar 2017 23:31:11 +0100
Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules
1 file changed, 18 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 484f6ebaca..79538df0cf 100644
+index b64518eed5..d07e371c57 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3286,6 +3286,24 @@ AC_ARG_ENABLE(readline,
+@@ -3273,6 +3273,24 @@ AC_ARG_ENABLE(readline,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
fi])
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
--
-2.13.5
+2.20.1
-From 21f787cb9bf0c1440981262f03bc881c5b77c0d8 Mon Sep 17 00:00:00 2001
+From e3221e3b714374e1e53dc11c9556733bd2807c2c Mon Sep 17 00:00:00 2001
From: Matt Weber <matthew.weber@rockwellcollins.com>
Date: Fri, 6 Oct 2017 09:54:15 -0500
Subject: [PATCH] python-config.sh: don't reassign ${prefix}
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
-index 9e259c0..8b249d9 100644
+index a1bc3cd5f7..164d2d3603 100644
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
@@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0")
exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
exec_prefix_real=${prefix_real}
includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
-@@ -48,7 +48,7 @@ LINKFORSHARED="@LINKFORSHARED@"
+@@ -49,7 +49,7 @@ LDLIBRARY="@LDLIBRARY@"
OPT="@OPT@"
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
LDVERSION="@LDVERSION@"
SO="@EXT_SUFFIX@"
PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
--
-2.14.3
+2.20.1
-From ad4537a75c798341824ab18bd1dc622f8dc2bc3a Mon Sep 17 00:00:00 2001
+From 28008e1e4f0349241d22aace3c54f7e9425c6c1f Mon Sep 17 00:00:00 2001
From: Adam Duskett <aduskett@gmail.com>
Date: Fri, 20 Jul 2018 10:17:39 -0400
Subject: [PATCH] Fix cross compiling the uuid module
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index 1a7085c5c4..f33d0b57b8 100644
+index a7f2e23d87..b0274a3f67 100644
--- a/setup.py
+++ b/setup.py
-@@ -1671,7 +1671,8 @@ class PyBuildExt(build_ext):
- missing.append('_tkinter')
+@@ -1674,7 +1674,8 @@ class PyBuildExt(build_ext):
+ def detect_uuid(self):
# Build the _uuid module if possible
-- uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"])
-+ uuid_incs = find_file("uuid.h", inc_dirs,
-+ [os.path.join(inc_dir, 'uuid') for inc_dir in inc_dirs])
+- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
++ uuid_incs = find_file("uuid.h", self.inc_dirs,
++ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs])
if uuid_incs is not None:
- if self.compiler.find_library_file(lib_dirs, 'uuid'):
+ if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
uuid_libs = ['uuid']
--
-2.14.4
+2.20.1
-From 1fe33c7bee9e6410f56c956ea19efd2f617176ae Mon Sep 17 00:00:00 2001
+From 74007603df0921450f14e8626df36140426cc300 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sat, 18 Aug 2018 10:54:56 +0200
Subject: [PATCH] Add an option to disable uuid module
1 file changed, 9 insertions(+)
diff --git a/configure.ac b/configure.ac
-index b022460e73..505b7c9be0 100644
+index d07e371c57..55ab6c3c26 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3322,6 +3322,15 @@ if test "$CURSES" = "no"; then
+@@ -3309,6 +3309,15 @@ if test "$CURSES" = "no"; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
fi
AC_ARG_ENABLE(pydoc,
--
-2.14.4
+2.20.1
-From ba10bac420398270a0b992e85d93383373d5fcac Mon Sep 17 00:00:00 2001
+From 3ddda00652f809a3bd8b4e3f7b0a3a4270b280a6 Mon Sep 17 00:00:00 2001
From: Adam Duskett <aduskett@gmail.com>
Date: Thu, 16 Aug 2018 14:52:37 -0700
Subject: [PATCH] fix building on older distributions
os.unlink(new_path)
--
-2.14.4
+2.20.1
-From e1a2c27bcb9091f851ef7a9c7d59822a125a0b8e Mon Sep 17 00:00:00 2001
+From 5932fedd9d1d43a230fa353df434f253e9d2b5a0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 2 Aug 2019 15:53:16 +0200
Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index e5fb7e7b0b..9c64f960d6 100644
+index 55ab6c3c26..4a6d0662ac 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -724,7 +724,9 @@ then
+@@ -700,7 +700,9 @@ then
fi
AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
--
-2.11.0
+2.20.1
-# From https://www.python.org/downloads/release/python-374/
-md5 d33e4aae66097051c2eca45ee3604803 Python-3.7.4.tar.xz
+# From https://www.python.org/downloads/release/python-380/
+md5 dbac8df9d8b9edc678d0f4cacdb7dbb0 Python-3.8.0.tar.xz
# Locally computed
-sha256 fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f Python-3.7.4.tar.xz
+sha256 b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84 Python-3.8.0.tar.xz
sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE
#
################################################################################
-PYTHON3_VERSION_MAJOR = 3.7
-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4
+PYTHON3_VERSION_MAJOR = 3.8
+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
PYTHON3_LICENSE = Python-2.0, others
projects / buildroot.git / commitdiff