Index: third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch |
diff --git a/third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch b/third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch |
new file mode 100644 |
index 0000000000000000000000000000000000000000..ec00897f12fe30ebf3b2fe31611d270dbe820c45 |
--- /dev/null |
+++ b/third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch |
@@ -0,0 +1,107 @@ |
+From 3418fd3e3a60fe9f8b6c52f2aad93dcdf3b7af93 Mon Sep 17 00:00:00 2001 |
+From: Scott Hess <shess@chromium.org> |
+Date: Fri, 16 Jan 2015 10:24:30 -0800 |
+Subject: [PATCH 01/16] [test] SQLite tests compiling on Linux. |
+ |
+--- |
+ third_party/sqlite/src/Makefile.linux-gcc | 42 ++++++++++++++++++++++--------- |
+ 1 file changed, 30 insertions(+), 12 deletions(-) |
+ |
+diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc |
+index 1c9f24f..6d67ba7 100644 |
+--- a/third_party/sqlite/src/Makefile.linux-gcc |
++++ b/third_party/sqlite/src/Makefile.linux-gcc |
+@@ -14,7 +14,7 @@ |
+ #### The toplevel directory of the source tree. This is the directory |
+ # that contains this "Makefile.in" and the "configure.in" script. |
+ # |
+-TOP = ../sqlite |
++TOP = .. |
+ |
+ #### C Compiler and options for use in building executables that |
+ # will run on the platform that is doing the build. |
+@@ -32,19 +32,19 @@ USLEEP = -DHAVE_USLEEP=1 |
+ # multi-threaded program, then define the following macro |
+ # appropriately: |
+ # |
+-#THREADSAFE = -DTHREADSAFE=1 |
+-THREADSAFE = -DTHREADSAFE=0 |
++THREADSAFE = -DTHREADSAFE=1 |
++#THREADSAFE = -DTHREADSAFE=0 |
+ |
+ #### Specify any extra linker options needed to make the library |
+ # thread safe |
+ # |
+-#THREADLIB = -lpthread |
+-THREADLIB = |
++THREADLIB = -lpthread |
++#THREADLIB = |
+ |
+ #### Specify any extra libraries needed to access required functions. |
+ # |
+ #TLIBS = -lrt # fdatasync on Solaris 8 |
+-TLIBS = |
++TLIBS = -ldl |
+ |
+ #### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1 |
+ # to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all |
+@@ -58,7 +58,25 @@ TLIBS = |
+ #OPTS = -DSQLITE_DEBUG=1 |
+ #OPTS = |
+ OPTS = -DNDEBUG=1 |
+-OPTS += -DHAVE_FDATASYNC=1 |
++#OPTS += -DHAVE_FDATASYNC=1 |
++ |
++# These flags match those for SQLITE_CFLAGS in config.mk. |
++ |
++OPTS += -DSQLITE_CORE |
++OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 |
++OPTS += -DHAVE_USLEEP=1 |
++ |
++# Additional SQLite tests. |
++OPTS += -DSQLITE_MEMDEBUG=1 |
++ |
++# Don't include these ones, they break the SQLite tests. |
++# -DSQLITE_OMIT_ATTACH=1 \ |
++# -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
++# -DSQLITE_OMIT_VACUUM=1 \ |
++# -DSQLITE_TRANSACTION_DEFAULT_IMMEDIATE=1 \ |
++ |
++# TODO(shess) I can't see why I need this setting. |
++OPTS += -DOS_UNIX=1 |
+ |
+ #### The suffix to add to executable files. ".exe" for windows. |
+ # Nothing for unix. |
+@@ -70,7 +88,7 @@ EXE = |
+ # will run on the target platform. This is usually the same |
+ # as BCC, unless you are cross-compiling. |
+ # |
+-TCC = gcc -O6 |
++TCC = gcc -Os |
+ #TCC = gcc -g -O0 -Wall |
+ #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
+ #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6 |
+@@ -91,16 +109,16 @@ SHPREFIX = lib |
+ |
+ #### Extra compiler options needed for programs that use the TCL library. |
+ # |
+-#TCL_FLAGS = |
++TCL_FLAGS = -I/usr/include/tcl8.5 |
+ #TCL_FLAGS = -DSTATIC_BUILD=1 |
+-TCL_FLAGS = -I/home/drh/tcltk/8.5linux |
++#TCL_FLAGS = -I/home/drh/tcltk/8.5linux |
+ #TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1 |
+ #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux |
+ |
+ #### Linker options needed to link against the TCL library. |
+ # |
+-#LIBTCL = -ltcl -lm -ldl |
+-LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl |
++LIBTCL = -ltcl8.5 -lm -ldl |
++#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl |
+ #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt |
+ #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc |
+ |
+-- |
+2.2.1 |
+ |