| OLD | NEW |
| (Empty) | |
| 1 From 6125c2ecdd580204a0dddd543f1609818e06a73b Mon Sep 17 00:00:00 2001 |
| 2 From: Scott Hess <shess@chromium.org> |
| 3 Date: Fri, 16 Jan 2015 10:24:30 -0800 |
| 4 Subject: [PATCH 01/23] [test] SQLite tests compiling on Linux. |
| 5 |
| 6 --- |
| 7 third_party/sqlite/src/Makefile.linux-gcc | 42 ++++++++++++++++++++++--------- |
| 8 1 file changed, 30 insertions(+), 12 deletions(-) |
| 9 |
| 10 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/
Makefile.linux-gcc |
| 11 index 1c9f24f..6d67ba7 100644 |
| 12 --- a/third_party/sqlite/src/Makefile.linux-gcc |
| 13 +++ b/third_party/sqlite/src/Makefile.linux-gcc |
| 14 @@ -14,7 +14,7 @@ |
| 15 #### The toplevel directory of the source tree. This is the directory |
| 16 # that contains this "Makefile.in" and the "configure.in" script. |
| 17 # |
| 18 -TOP = ../sqlite |
| 19 +TOP = .. |
| 20 |
| 21 #### C Compiler and options for use in building executables that |
| 22 # will run on the platform that is doing the build. |
| 23 @@ -32,19 +32,19 @@ USLEEP = -DHAVE_USLEEP=1 |
| 24 # multi-threaded program, then define the following macro |
| 25 # appropriately: |
| 26 # |
| 27 -#THREADSAFE = -DTHREADSAFE=1 |
| 28 -THREADSAFE = -DTHREADSAFE=0 |
| 29 +THREADSAFE = -DTHREADSAFE=1 |
| 30 +#THREADSAFE = -DTHREADSAFE=0 |
| 31 |
| 32 #### Specify any extra linker options needed to make the library |
| 33 # thread safe |
| 34 # |
| 35 -#THREADLIB = -lpthread |
| 36 -THREADLIB = |
| 37 +THREADLIB = -lpthread |
| 38 +#THREADLIB = |
| 39 |
| 40 #### Specify any extra libraries needed to access required functions. |
| 41 # |
| 42 #TLIBS = -lrt # fdatasync on Solaris 8 |
| 43 -TLIBS = |
| 44 +TLIBS = -ldl |
| 45 |
| 46 #### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1 |
| 47 # to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all |
| 48 @@ -58,7 +58,25 @@ TLIBS = |
| 49 #OPTS = -DSQLITE_DEBUG=1 |
| 50 #OPTS = |
| 51 OPTS = -DNDEBUG=1 |
| 52 -OPTS += -DHAVE_FDATASYNC=1 |
| 53 +#OPTS += -DHAVE_FDATASYNC=1 |
| 54 + |
| 55 +# These flags match those for SQLITE_CFLAGS in config.mk. |
| 56 + |
| 57 +OPTS += -DSQLITE_CORE |
| 58 +OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 |
| 59 +OPTS += -DHAVE_USLEEP=1 |
| 60 + |
| 61 +# Additional SQLite tests. |
| 62 +OPTS += -DSQLITE_MEMDEBUG=1 |
| 63 + |
| 64 +# Don't include these ones, they break the SQLite tests. |
| 65 +# -DSQLITE_OMIT_ATTACH=1 \ |
| 66 +# -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 67 +# -DSQLITE_OMIT_VACUUM=1 \ |
| 68 +# -DSQLITE_TRANSACTION_DEFAULT_IMMEDIATE=1 \ |
| 69 + |
| 70 +# TODO(shess) I can't see why I need this setting. |
| 71 +OPTS += -DOS_UNIX=1 |
| 72 |
| 73 #### The suffix to add to executable files. ".exe" for windows. |
| 74 # Nothing for unix. |
| 75 @@ -70,7 +88,7 @@ EXE = |
| 76 # will run on the target platform. This is usually the same |
| 77 # as BCC, unless you are cross-compiling. |
| 78 # |
| 79 -TCC = gcc -O6 |
| 80 +TCC = gcc -Os |
| 81 #TCC = gcc -g -O0 -Wall |
| 82 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 83 #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6 |
| 84 @@ -91,16 +109,16 @@ SHPREFIX = lib |
| 85 |
| 86 #### Extra compiler options needed for programs that use the TCL library. |
| 87 # |
| 88 -#TCL_FLAGS = |
| 89 +TCL_FLAGS = -I/usr/include/tcl8.5 |
| 90 #TCL_FLAGS = -DSTATIC_BUILD=1 |
| 91 -TCL_FLAGS = -I/home/drh/tcltk/8.5linux |
| 92 +#TCL_FLAGS = -I/home/drh/tcltk/8.5linux |
| 93 #TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1 |
| 94 #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux |
| 95 |
| 96 #### Linker options needed to link against the TCL library. |
| 97 # |
| 98 -#LIBTCL = -ltcl -lm -ldl |
| 99 -LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl |
| 100 +LIBTCL = -ltcl8.5 -lm -ldl |
| 101 +#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl |
| 102 #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt |
| 103 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc |
| 104 |
| 105 -- |
| 106 2.2.1 |
| 107 |
| OLD | NEW |