Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Side by Side Diff: third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch

Issue 1073293002: [sql] Remove fts2 patches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put back SQLITE_CORE only for the icu component for iOS Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 From 3418fd3e3a60fe9f8b6c52f2aad93dcdf3b7af93 Mon Sep 17 00:00:00 2001 1 From 3418fd3e3a60fe9f8b6c52f2aad93dcdf3b7af93 Mon Sep 17 00:00:00 2001
2 From: Scott Hess <shess@chromium.org> 2 From: Scott Hess <shess@chromium.org>
3 Date: Fri, 16 Jan 2015 10:24:30 -0800 3 Date: Fri, 16 Jan 2015 10:24:30 -0800
4 Subject: [PATCH 01/16] [test] SQLite tests compiling on Linux. 4 Subject: [PATCH 01/16] [test] SQLite tests compiling on Linux.
5 5
6 --- 6 ---
7 third_party/sqlite/src/Makefile.linux-gcc | 42 ++++++++++++++++++++++--------- 7 third_party/sqlite/src/Makefile.linux-gcc | 42 ++++++++++++++++++++++---------
8 1 file changed, 30 insertions(+), 12 deletions(-) 8 1 file changed, 30 insertions(+), 12 deletions(-)
9 9
10 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/ Makefile.linux-gcc 10 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/ Makefile.linux-gcc
(...skipping 27 matching lines...) Expand all
38 +#THREADLIB = 38 +#THREADLIB =
39 39
40 #### Specify any extra libraries needed to access required functions. 40 #### Specify any extra libraries needed to access required functions.
41 # 41 #
42 #TLIBS = -lrt # fdatasync on Solaris 8 42 #TLIBS = -lrt # fdatasync on Solaris 8
43 -TLIBS = 43 -TLIBS =
44 +TLIBS = -ldl 44 +TLIBS = -ldl
45 45
46 #### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1 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 47 # to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
48 @@ -58,7 +58,25 @@ TLIBS = 48 @@ -58,7 +58,24 @@ TLIBS =
49 #OPTS = -DSQLITE_DEBUG=1 49 #OPTS = -DSQLITE_DEBUG=1
50 #OPTS = 50 #OPTS =
51 OPTS = -DNDEBUG=1 51 OPTS = -DNDEBUG=1
52 -OPTS += -DHAVE_FDATASYNC=1 52 -OPTS += -DHAVE_FDATASYNC=1
53 +#OPTS += -DHAVE_FDATASYNC=1 53 +#OPTS += -DHAVE_FDATASYNC=1
54 + 54 +
55 +# These flags match those for SQLITE_CFLAGS in config.mk. 55 +# These flags match those for SQLITE_CFLAGS in config.mk.
56 + 56 +
57 +OPTS += -DSQLITE_CORE
58 +OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 57 +OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
59 +OPTS += -DHAVE_USLEEP=1 58 +OPTS += -DHAVE_USLEEP=1
60 + 59 +
61 +# Additional SQLite tests. 60 +# Additional SQLite tests.
62 +OPTS += -DSQLITE_MEMDEBUG=1 61 +OPTS += -DSQLITE_MEMDEBUG=1
63 + 62 +
64 +# Don't include these ones, they break the SQLite tests. 63 +# Don't include these ones, they break the SQLite tests.
65 +# -DSQLITE_OMIT_ATTACH=1 \ 64 +# -DSQLITE_OMIT_ATTACH=1 \
66 +# -DSQLITE_OMIT_LOAD_EXTENSION=1 \ 65 +# -DSQLITE_OMIT_LOAD_EXTENSION=1 \
67 +# -DSQLITE_OMIT_VACUUM=1 \ 66 +# -DSQLITE_OMIT_VACUUM=1 \
(...skipping 30 matching lines...) Expand all
98 -#LIBTCL = -ltcl -lm -ldl 97 -#LIBTCL = -ltcl -lm -ldl
99 -LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl 98 -LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
100 +LIBTCL = -ltcl8.5 -lm -ldl 99 +LIBTCL = -ltcl8.5 -lm -ldl
101 +#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl 100 +#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
102 #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt 101 #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
103 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc 102 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
104 103
105 -- 104 --
106 2.2.1 105 2.2.1
107 106
OLDNEW
« no previous file with comments | « third_party/sqlite/README.chromium ('k') | third_party/sqlite/patches/0010-fts2-test-Add-fts2-to-testfixture.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698