bpo-38380: Update macOS & Windows builds to SQLite v3.31.1 (GH-18678)

Automerge-Triggered-By: @zooba
This commit is contained in:
Erlend Egeberg Aasland 2020-03-02 13:25:10 +01:00 committed by GitHub
parent 2110551761
commit 1382c3289b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 6 deletions

View file

@ -313,9 +313,9 @@ def library_recipes():
),
),
dict(
name="SQLite 3.28.0",
url="https://www.sqlite.org/2019/sqlite-autoconf-3280000.tar.gz",
checksum='3c68eb400f8354605736cd55400e1572',
name="SQLite 3.31.1",
url="https://sqlite.org/2020/sqlite-autoconf-3310100.tar.gz",
checksum='2d0a553534c521504e3ac3ad3b90f125',
extra_cflags=('-Os '
'-DSQLITE_ENABLE_FTS5 '
'-DSQLITE_ENABLE_FTS4 '

View file

@ -0,0 +1 @@
Update Windows builds to use SQLite 3.31.1

View file

@ -0,0 +1 @@
Update macOS builds to use SQLite 3.31.1

View file

@ -54,7 +54,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1d
set libraries=%libraries% sqlite-3.28.0.0
set libraries=%libraries% sqlite-3.31.1.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6

View file

@ -56,7 +56,7 @@
<ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir>
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.28.0.0\</sqlite3Dir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.31.1.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<libffiDir>$(ExternalsDir)libffi\</libffiDir>

View file

@ -184,7 +184,7 @@ _ssl
again when building.
_sqlite3
Wraps SQLite 3.28.0.0, which is itself built by sqlite3.vcxproj
Wraps SQLite 3.31.1.0, which is itself built by sqlite3.vcxproj
Homepage:
http://www.sqlite.org/
_tkinter