Merge branch master-3.6 from upstream into branch master-3.6-slp.

Author: Anselm Kruis

.gitattributes

@@ -4,3 +4,4 @@ meta.yaml text eol=lf
 build.sh text eol=lf
 bld.bat text eol=crlf
 recipe/0013-Win32-Do-not-download-externals.patch binary
+recipe/0019-Unvendor-sqlite3.patch binary

recipe/0001-Add-Anaconda-Distribution-version-logic.patch

@@ -1,20 +1,20 @@
-From f1b29597d5250704f227aba35030186b77a58ccb Mon Sep 17 00:00:00 2001
+From 218ca631727207485a1ae66cc4812835a8743067 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Tue, 15 Aug 2017 22:34:16 +0100
-Subject: [PATCH 01/16] Add Anaconda Distribution version logic
+Subject: [PATCH 01/19] Add Anaconda Distribution version logic
 
 ---
  Include/pylifecycle.h |  1 +
  Lib/platform.py       |  1 +
  Modules/main.c        |  3 ++-
- Python/getversion.c   | 44 +++++++++++++++++++++++++++++++++++++++++---
+ Python/getversion.c   | 44 ++++++++++++++++++++++++++++++++++++++++---
  4 files changed, 45 insertions(+), 4 deletions(-)
 
 diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
-index 01abfa9fcd..ac8e19a308 100644
+index 9a528218e4..4b84977e61 100644
 --- a/Include/pylifecycle.h
 +++ b/Include/pylifecycle.h
-@@ -64,6 +64,7 @@ int _Py_CheckPython3();
+@@ -66,6 +66,7 @@ int _Py_CheckPython3();
  #endif
 
  /* In their own files */

recipe/0002-Darwin-Omit-PYTHONFRAMEWORK-site-packages.patch

@@ -1,7 +1,7 @@
-From 1015509a2c38317f4ea75f527f003f000d73f060 Mon Sep 17 00:00:00 2001
+From 359b0bebfe38b56b1a370a1edcfc21fd41af3d29 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 11:55:54 +0100
-Subject: [PATCH 02/16] Darwin: Omit PYTHONFRAMEWORK site-packages
+Subject: [PATCH 02/19] Darwin: Omit PYTHONFRAMEWORK site-packages
 
 We probably do not need this patch as our Python is
 probably not built as a PYTHONFRAMWORK build.
@@ -10,7 +10,7 @@ probably not built as a PYTHONFRAMWORK build.
  1 file changed, 1 insertion(+), 9 deletions(-)
 
 diff --git a/Lib/site.py b/Lib/site.py
-index 1bd63ccf6a..0c089b9beb 100644
+index 86ca2dba61..c01aba1e35 100644
 --- a/Lib/site.py
 +++ b/Lib/site.py
 @@ -310,15 +310,7 @@ def getsitepackages(prefixes=None):
@@ -31,5 +31,5 @@ index 1bd63ccf6a..0c089b9beb 100644
 
  def addsitepackages(known_paths, prefixes=None):
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0003-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch

@@ -1,7 +1,7 @@
-From 8a7074b19f542afc94c8744ae160e8a5937f912b Mon Sep 17 00:00:00 2001
+From 75a946b46c74c91345128adade6ca99c6fcb1a55 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 08:48:16 +0100
-Subject: [PATCH 03/16] Darwin: Add -arch x86_64 to UnicCCompiler ld_args
+Subject: [PATCH 03/19] Darwin: Add -arch x86_64 to UnicCCompiler ld_args
 
 ---
  Lib/distutils/unixccompiler.py | 1 +
@@ -20,5 +20,5 @@ index 3f321c28dc..a36acdc57f 100644
                  self.spawn(linker + ld_args)
              except DistutilsExecError as msg:
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0004-Win32-distutils-Also-look-for-executable.bat.patch

@@ -1,7 +1,7 @@
-From df6c4d8f5ac055453e68fd4df9df8dddf06c1efe Mon Sep 17 00:00:00 2001
+From 852620f1fa73d862f6ea09d5db1c973319ed0db0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 11:07:08 +0100
-Subject: [PATCH 04/16] Win32: distutils: Also look for executable.bat
+Subject: [PATCH 04/19] Win32: distutils: Also look for executable.bat
 
 This patch should probably not exist, or at least be
 rewritten. See the comments.
@@ -10,11 +10,11 @@ rewritten. See the comments.
  1 file changed, 25 insertions(+), 9 deletions(-)
 
 diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py
-index 5dd415a283..bef82fb1ac 100644
+index 5387688093..ae9cb8eee0 100644
 --- a/Lib/distutils/spawn.py
 +++ b/Lib/distutils/spawn.py
 @@ -176,17 +176,33 @@ def find_executable(executable, path=None):
-         path = os.environ['PATH']
+         path = os.environ.get('PATH', os.defpath)
 
      paths = path.split(os.pathsep)
 -    base, ext = os.path.splitext(executable)
@@ -57,5 +57,5 @@ index 5dd415a283..bef82fb1ac 100644
      else:
          return executable
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0005-Win32-Ensure-Library-bin-is-in-os.environ-PATH.patch

@@ -1,17 +1,17 @@
-From c21b1def3ee610536be0f3f76e36d4f0e4fbbbb8 Mon Sep 17 00:00:00 2001
+From 77160444308a7a7e9e113f5d7f049f00dae3c9c9 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 11:15:26 +0100
-Subject: [PATCH 05/16] Win32: Ensure Library\bin is in os.environ["PATH"]
+Subject: [PATCH 05/19] Win32: Ensure Library\bin is in os.environ["PATH"]
 
 ---
  Lib/site.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/Lib/site.py b/Lib/site.py
-index 0c089b9beb..eaa93bb2f8 100644
+index c01aba1e35..088b0d57a8 100644
 --- a/Lib/site.py
 +++ b/Lib/site.py
-@@ -529,6 +529,11 @@ def main():
+@@ -538,6 +538,11 @@ def main():
      execsitecustomize()
      if ENABLE_USER_SITE:
          execusercustomize()
@@ -24,5 +24,5 @@ index 0c089b9beb..eaa93bb2f8 100644
  # Prevent extending of sys.path when python was started with -S and
  # site is imported later.
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0006-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,15 +1,15 @@
-From ebe9ce41083aedff1c28786753660482a268725c Mon Sep 17 00:00:00 2001
+From b6df49ac970959f99c2c96640c1cad0f4d9411b5 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
-Subject: [PATCH 06/16] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 06/19] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
  Modules/selectmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
-index 7e81f1904c..22c6dc2b35 100644
+index 2bc7b9ff79..b1c601b553 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
 @@ -33,7 +33,7 @@
@@ -22,5 +22,5 @@ index 7e81f1904c..22c6dc2b35 100644
 
  #if defined(HAVE_POLL_H)
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0007-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch

@@ -1,7 +1,7 @@
-From a4094d84003cf0266ef2c5a0b7abee7283de246f Mon Sep 17 00:00:00 2001
+From 940a3533f6b08435d24cb0dd3dbfeaa7cd1bccb1 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 11:59:00 +0100
-Subject: [PATCH 07/16] Win32: distutils: Add support to cygwinccompiler for
+Subject: [PATCH 07/19] Win32: distutils: Add support to cygwinccompiler for
  VS>=2015
 
 Really this is for mingw-w64 though
@@ -24,5 +24,5 @@ index 1c36990347..fe95547112 100644
              raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0008-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch

@@ -1,7 +1,7 @@
-From 6237bedf1e20d60448839006e6cc8c7ba71d0992 Mon Sep 17 00:00:00 2001
+From b5b69f968ef6480847259efecf6a8bda4fdd321b Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 11:45:28 +0100
-Subject: [PATCH 08/16] Do not pass -g to GCC when not Py_DEBUG
+Subject: [PATCH 08/19] Do not pass -g to GCC when not Py_DEBUG
 
 This bloats our exe and our modules a lot.
 ---
@@ -10,10 +10,10 @@ This bloats our exe and our modules a lot.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 8c2a0ca546..4897ff14ad 100755
+index e39c16eee2..5db31f475d 100755
 --- a/configure
 +++ b/configure
-@@ -4265,9 +4265,9 @@ if test "$ac_test_CFLAGS" = set; then
+@@ -4271,9 +4271,9 @@ if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -25,7 +25,7 @@ index 8c2a0ca546..4897ff14ad 100755
    fi
  else
    if test "$GCC" = yes; then
-@@ -6910,7 +6910,7 @@ then
+@@ -6946,7 +6946,7 @@ then
                      OPT="-g -O0 -Wall"
                  fi
  	    else
@@ -35,10 +35,10 @@ index 8c2a0ca546..4897ff14ad 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index f2cd11730b..6cbb1eb91a 100644
+index cf280506bd..b24f7e8df0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1509,7 +1509,7 @@ then
+@@ -1539,7 +1539,7 @@ then
                      OPT="-g -O0 -Wall"
                  fi
  	    else
@@ -48,5 +48,5 @@ index f2cd11730b..6cbb1eb91a 100644
  	    ;;
  	*)
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0009-Support-cross-compiling-byte-code.patch

@@ -1,28 +1,28 @@
-From 1e7c3215a8a1c941479da36ae3aa652e3c70337b Mon Sep 17 00:00:00 2001
+From dbd0fcaaddd61affb8c5c30e2916c848d03e8d9c Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 12:17:33 +0100
-Subject: [PATCH 09/16] Support cross-compiling byte-code
+Subject: [PATCH 09/19] Support cross-compiling byte-code
 
 https://bugs.python.org/issue22724
 ---
- Makefile.pre.in | 19 ++++++++++---------
+ Makefile.pre.in | 20 +++++++++++---------
  configure       |  4 +++-
  configure.ac    |  4 +++-
- 3 files changed, 16 insertions(+), 11 deletions(-)
+ 3 files changed, 17 insertions(+), 11 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index d912a19e79..36554b5e24 100644
+index d15d93509d..a008a39b0b 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -231,6 +231,7 @@ BUILDPYTHON=	python$(BUILDEXE)
+@@ -237,6 +237,7 @@ BUILDPYTHON=	python$(BUILDEXE)
 
  PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@
  UPDATE_FILE=@PYTHON_FOR_REGEN@ $(srcdir)/Tools/scripts/update_file.py
 +PY_BUILD_ENVIRON=@PY_BUILD_ENVIRON@
  PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
  _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
  BUILD_GNU_TYPE=	@build@
-@@ -539,15 +540,15 @@ coverage-report: regen-grammar regen-importlib
+@@ -545,15 +546,16 @@ coverage-report: regen-grammar regen-importlib
 
  # Run "Argument Clinic" over all source files
  .PHONY=clinic
@@ -33,15 +33,16 @@ index d912a19e79..36554b5e24 100644
 
  # Build the interpreter
  $(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
 
  platform: $(BUILDPYTHON) pybuilddir.txt
 -	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
 +	$(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
++
 
  # Create build directory and generate the sysconfig build-time data there.
  # pybuilddir.txt contains the name of the build dir and is used for
-@@ -558,7 +559,7 @@ platform: $(BUILDPYTHON) pybuilddir.txt
+@@ -564,7 +566,7 @@ platform: $(BUILDPYTHON) pybuilddir.txt
  # or removed in case of failure.
  pybuilddir.txt: $(BUILDPYTHON)
  	@echo "none" > ./pybuilddir.txt
@@ -50,7 +51,7 @@ index d912a19e79..36554b5e24 100644
  	if test $$? -ne 0 ; then \
  		echo "generate-posix-vars failed" ; \
  		rm -f ./pybuilddir.txt ; \
-@@ -589,7 +590,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -595,7 +597,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
  	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
  		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -59,7 +60,7 @@ index d912a19e79..36554b5e24 100644
 
 
  # Build static library
-@@ -1091,7 +1092,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKI
+@@ -1090,7 +1092,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKI
  			upgrade) ensurepip="--upgrade" ;; \
  			install|*) ensurepip="" ;; \
  		esac; \
@@ -68,7 +69,7 @@ index d912a19e79..36554b5e24 100644
  			$$ensurepip --root=$(DESTDIR)/ ; \
  	fi
 
-@@ -1101,7 +1102,7 @@ altinstall: commoninstall
+@@ -1100,7 +1102,7 @@ altinstall: commoninstall
  			upgrade) ensurepip="--altinstall --upgrade" ;; \
  			install|*) ensurepip="--altinstall" ;; \
  		esac; \
@@ -77,7 +78,7 @@ index d912a19e79..36554b5e24 100644
  			$$ensurepip --root=$(DESTDIR)/ ; \
  	fi
 
-@@ -1472,7 +1473,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+@@ -1470,7 +1472,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -86,7 +87,7 @@ index d912a19e79..36554b5e24 100644
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-@@ -1556,7 +1557,7 @@ frameworkinstallextras:
+@@ -1554,7 +1556,7 @@ frameworkinstallextras:
  # This installs a few of the useful scripts in Tools/scripts
  scriptsinstall:
  	SRCDIR=$(srcdir) $(RUNSHARED) \
@@ -96,18 +97,18 @@ index d912a19e79..36554b5e24 100644
  	--install-scripts=$(BINDIR) \
  	--root=$(DESTDIR)/
 diff --git a/configure b/configure
-index 4897ff14ad..44ed296011 100755
+index 5db31f475d..96379d7937 100755
 --- a/configure
 +++ b/configure
-@@ -751,6 +751,7 @@ CONFIG_ARGS
+@@ -752,6 +752,7 @@ CONFIG_ARGS
  SOVERSION
  VERSION
  PYTHON_FOR_BUILD
 +PY_BUILD_ENVIRON
  PYTHON_FOR_REGEN
  host_os
  host_vendor
-@@ -2926,7 +2927,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; }
+@@ -2932,7 +2933,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; }
  	fi
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
  $as_echo "$interp" >&6; }
@@ -118,7 +119,7 @@ index 4897ff14ad..44ed296011 100755
  elif test "$cross_compiling" = maybe; then
      as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
 diff --git a/configure.ac b/configure.ac
-index 6cbb1eb91a..21de4b26ed 100644
+index b24f7e8df0..6404ad88db 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -73,13 +73,15 @@ if test "$cross_compiling" = yes; then
@@ -139,5 +140,5 @@ index 6cbb1eb91a..21de4b26ed 100644
 
  dnl Ensure that if prefix is specified, it does not end in a slash. If
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)
 

recipe/0010-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch

@@ -1,7 +1,7 @@
-From 726ecd9dde4a2252b254a4d34dbf8a54d114adfc Mon Sep 17 00:00:00 2001
+From 51952b8870efa2514d41afa49f9d96d8836ab070 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 12:23:02 +0100
-Subject: [PATCH 10/16] Win32: Fixes for Windows GCC interop needed by RPy2 and
+Subject: [PATCH 10/19] Win32: Fixes for Windows GCC interop needed by RPy2 and
  CVXOPT
 
 We must pass -DMS_WIN32 or -DMS_WIN64
@@ -31,5 +31,5 @@ index fe95547112..a5b759ddaf 100644
                               linker_so='%s %s %s'
                                          % (self.linker_dll, shared_option,
 -- 
-2.15.2 (Apple Git-101.1)
+2.17.2 (Apple Git-113)