Import SQLite 3.8.7.4.

third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch

Index: third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch
diff --git a/third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch b/third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch
deleted file mode 100644
index 256bc90f266383b18ba6a36c227582a4e5086b4c..0000000000000000000000000000000000000000
--- a/third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From cd533ad27b96a22b97457227c93e73d6eb397a71 Mon Sep 17 00:00:00 2001
-From: Scott Hess <shess@chromium.org>
-Date: Fri, 16 Jan 2015 13:07:04 -0800
-Subject: [PATCH 16/23] [fts2][test] Add fts2 to testfixture.
-
-TODO(shess): The main.mk change to build a.out is because under OSX gcc
-is a wrapper for clang, and it reports an error about having multiple
-outputs.  Figure out a less hacky solution.
----
- third_party/sqlite/src/Makefile.linux-gcc        |  1 +
- third_party/sqlite/src/ext/fts2/fts2.c           |  6 ++++--
- third_party/sqlite/src/ext/fts2/fts2_tokenizer.c |  5 ++++-
- third_party/sqlite/src/main.mk                   | 20 +++++++++++++++++++-
- 4 files changed, 28 insertions(+), 4 deletions(-)
-
-diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
-index f60f1a1..026c03c 100644
---- a/third_party/sqlite/src/Makefile.linux-gcc
-+++ b/third_party/sqlite/src/Makefile.linux-gcc
-@@ -67,6 +67,7 @@ OPTS = -DNDEBUG=1
- # These flags match those for SQLITE_CFLAGS in config.mk.
- 
- OPTS += -DSQLITE_CORE
-+OPTS += -DSQLITE_ENABLE_FTS2 -DSQLITE_ENABLE_BROKEN_FTS2
- OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
- OPTS += -DHAVE_USLEEP=1
- 
-diff --git a/third_party/sqlite/src/ext/fts2/fts2.c b/third_party/sqlite/src/ext/fts2/fts2.c
-index 74c2890..3d9728a 100644
---- a/third_party/sqlite/src/ext/fts2/fts2.c
-+++ b/third_party/sqlite/src/ext/fts2/fts2.c
-@@ -310,8 +310,10 @@
- #include "fts2_hash.h"
- #include "fts2_tokenizer.h"
- #include "sqlite3.h"
--#include "sqlite3ext.h"
--SQLITE_EXTENSION_INIT1
-+#ifndef SQLITE_CORE
-+# include "sqlite3ext.h"
-+  SQLITE_EXTENSION_INIT1
-+#endif
- 
- 
- /* TODO(shess) MAN, this thing needs some refactoring.  At minimum, it
-diff --git a/third_party/sqlite/src/ext/fts2/fts2_tokenizer.c b/third_party/sqlite/src/ext/fts2/fts2_tokenizer.c
-index f8b0663..a66c37a 100644
---- a/third_party/sqlite/src/ext/fts2/fts2_tokenizer.c
-+++ b/third_party/sqlite/src/ext/fts2/fts2_tokenizer.c
-@@ -28,11 +28,14 @@
- 
- #include "sqlite3.h"
- #include "sqlite3ext.h"
--SQLITE_EXTENSION_INIT1
-+#ifndef SQLITE_CORE
-+  SQLITE_EXTENSION_INIT1
-+#endif
- 
- #include "fts2_hash.h"
- #include "fts2_tokenizer.h"
- #include <assert.h>
-+#include <stddef.h>
- 
- /*
- ** Implementation of the SQL scalar function for accessing the underlying 
-diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-index d20103f..5b010c3 100644
---- a/third_party/sqlite/src/main.mk
-+++ b/third_party/sqlite/src/main.mk
-@@ -69,6 +69,12 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o \
-          wal.o walker.o where.o utf.o vtab.o
- 
- 
-+LIBOBJ+= fts2.o \
-+         fts2_hash.o \
-+         fts2_icu.o \
-+         fts2_porter.o \
-+         fts2_tokenizer.o \
-+         fts2_tokenizer1.o
- 
- # All of the source code files.
- #
-@@ -305,6 +311,17 @@ TESTSRC2 = \
-   $(TOP)/ext/fts3/fts3_write.c \
-   $(TOP)/ext/async/sqlite3async.c
- 
-+TESTSRC2 += \
-+  $(TOP)/ext/fts2/fts2.c \
-+  $(TOP)/ext/fts2/fts2.h \
-+  $(TOP)/ext/fts2/fts2_hash.c \
-+  $(TOP)/ext/fts2/fts2_hash.h \
-+  $(TOP)/ext/fts2/fts2_icu.c \
-+  $(TOP)/ext/fts2/fts2_porter.c \
-+  $(TOP)/ext/fts2/fts2_tokenizer.h \
-+  $(TOP)/ext/fts2/fts2_tokenizer.c \
-+  $(TOP)/ext/fts2/fts2_tokenizer1.c
-+
- # Header files used by all library source files.
- #
- HDR = \
-@@ -515,7 +532,8 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
- testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
- 	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
- 		$(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
--		-o testfixture$(EXE) $(LIBTCL) $(THREADLIB) libsqlite3.a $(TLIBS)
-+		$(LIBTCL) $(THREADLIB) libsqlite3.a $(TLIBS)
-+	mv a.out testfixture$(EXE)
- 
- amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
- 	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
--- 
-2.2.1
-