summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-07-29 06:25:41 (GMT)
committerNed Deily <nad@acm.org>2015-07-29 06:25:41 (GMT)
commite0374c7a03a2876815f96e759bbf2093601b7207 (patch)
tree50a190e64073ef0dd5fd85c04bcc2b42e9542b1e
parentf7e3b5e153718931631e7fdf21779843e6e73379 (diff)
parentbb1c079657fa8f8f9d7ec537f83b1fed1d9b413c (diff)
downloadcpython-e0374c7a03a2876815f96e759bbf2093601b7207.zip
cpython-e0374c7a03a2876815f96e759bbf2093601b7207.tar.gz
cpython-e0374c7a03a2876815f96e759bbf2093601b7207.tar.bz2
Issue #19450: merge from 3.4
-rw-r--r--Mac/BuildScript/README.txt4
-rwxr-xr-xMac/BuildScript/build-installer.py6
-rw-r--r--Misc/NEWS2
3 files changed, 6 insertions, 6 deletions
diff --git a/Mac/BuildScript/README.txt b/Mac/BuildScript/README.txt
index 46830ad..f8b25fa 100644
--- a/Mac/BuildScript/README.txt
+++ b/Mac/BuildScript/README.txt
@@ -22,7 +22,7 @@ for each release.
- builds the following third-party libraries
* NCurses 5.9 (http://bugs.python.org/issue15037)
- * SQLite 3.8.3.1
+ * SQLite 3.8.11
* XZ 5.0.5
- uses system-supplied versions of third-party libraries
@@ -57,7 +57,7 @@ for each release.
- builds the following third-party libraries
* NCurses 5.9 (http://bugs.python.org/issue15037)
- * SQLite 3.8.3.1
+ * SQLite 3.8.11
* XZ 5.0.5
- uses system-supplied versions of third-party libraries
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 54abd67..e8a1126 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -339,9 +339,9 @@ def library_recipes():
),
),
dict(
- name="SQLite 3.8.3.1",
- url="http://www.sqlite.org/2014/sqlite-autoconf-3080301.tar.gz",
- checksum='509ff98d8dc9729b618b7e96612079c6',
+ name="SQLite 3.8.11",
+ url="https://www.sqlite.org/2015/sqlite-autoconf-3081100.tar.gz",
+ checksum='77b451925121028befbddbf45ea2bc49',
extra_cflags=('-Os '
'-DSQLITE_ENABLE_FTS4 '
'-DSQLITE_ENABLE_FTS3_PARENTHESIS '
diff --git a/Misc/NEWS b/Misc/NEWS
index 9f3ca11..f2de335 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,7 +16,7 @@ Library
- Issue #23254: Document how to close the TCPServer listening socket.
Patch from Martin Panter.
-- Issue #19450: Update Windows builds to use SQLite 3.8.11.0
+- Issue #19450: Update Windows and OS X installer builds to use SQLite 3.8.11.
- Issue #17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella.