diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-03-17 14:41:36 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-03-17 14:41:36 -0700 |
| commit | 1c73ed5422f31dc7870929a53ba82f8de1039e19 (patch) | |
| tree | 8b37994c574368dfa16282383ac6f899c3b0a188 | |
| parent | c3419d5f754b26d1b1755f64bc8fa5ef35fcfcfe (diff) | |
| download | python-upstream-2.7.tar.gz | |
Issue #19450: Update Windows builds to use SQLite 3.8.11.0.upstream-2.7lldb-master-dev
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -170,6 +170,8 @@ Tests Build ----- +- Issue #19450: Update Windows builds to use SQLite 3.8.11.0. + - Issue #17603: Avoid error about nonexistant fileblocks.o file by using a lower-level check for st_blocks in struct stat. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 2c940fa16f..9a40992e04 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -59,7 +59,7 @@ set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g
-set libraries=%libraries% sqlite-3.6.21
+set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.5
diff --git a/PCbuild/python.props b/PCbuild/python.props index 23dfb561a6..abfb8264d0 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -32,7 +32,7 @@ <!-- Directories of external projects. tcltk is handled in tcltk.props --> <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir> - <sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir> + <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir> <opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 9b21bea84f..8f9e80534f 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -218,7 +218,7 @@ _ssl functionality to _ssl or _hashlib. They will not clean up their output
with the normal Clean target; CleanAll should be used instead.
_sqlite3
- Wraps SQLite 3.6.21, which is itself built by sqlite3.vcxproj
+ Wraps SQLite 3.8.11.0, which is itself built by sqlite3.vcxproj
Homepage:
http://www.sqlite.org/
_tkinter
|