third_party/sqlite/patches/0001-test-SQLite-tests-compiling-on-Linux.patch - Issue 2751253002: [sql] Import SQLite 3.17.0.

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

Issue 2751253002: [sql] Import SQLite 3.17.0. (Closed)

Patch Set: also clang on Linux i386 Created 3 years, 9 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:

« no previous file with comments | « third_party/sqlite/amalgamation/sqlite3.h ('k') | third_party/sqlite/patches/0002-Use-seperate-page-cache-pools-for-each-sqlite-connec.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 From 35703557681c70acd710c1ee83f1ef54eef06df8 Mon Sep 17 00:00:00 2001	1 From 4db034497c5e8dc8568855f4c751dd653c2a3379 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/10] [test] SQLite tests compiling on Linux.	4 Subject: [PATCH 01/10] [test] SQLite tests compiling on Linux.

5	5

6 ---	6 ---

7 third_party/sqlite/src/Makefile.linux-gcc \| 41 ++++++++++++++++++++++---------	7 third_party/sqlite/src/Makefile.linux-gcc \| 41 ++++++++++++++++++++++---------

8 third_party/sqlite/src/main.mk \| 2 +-	8 third_party/sqlite/src/main.mk \| 2 +-

9 2 files changed, 30 insertions(+), 13 deletions(-)	9 2 files changed, 30 insertions(+), 13 deletions(-)

10	10

11 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/ Makefile.linux-gcc	11 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/ Makefile.linux-gcc

12 index 1491a4b..a1dec21 100644	12 index 1491a4b02a80..a1dec21affea 100644

13 --- a/third_party/sqlite/src/Makefile.linux-gcc	13 --- a/third_party/sqlite/src/Makefile.linux-gcc

14 +++ b/third_party/sqlite/src/Makefile.linux-gcc	14 +++ b/third_party/sqlite/src/Makefile.linux-gcc

15 @@ -14,7 +14,7 @@	15 @@ -14,7 +14,7 @@

16 #### The toplevel directory of the source tree. This is the directory	16 #### The toplevel directory of the source tree. This is the directory

17 # that contains this "Makefile.in" and the "configure.in" script.	17 # that contains this "Makefile.in" and the "configure.in" script.

18 #	18 #

19 -TOP = ../sqlite	19 -TOP = ../sqlite

20 +TOP = ..	20 +TOP = ..

21	21

22 #### C Compiler and options for use in building executables that	22 #### C Compiler and options for use in building executables that

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 #### Linker options needed to link against the TCL library.	96 #### Linker options needed to link against the TCL library.

97 #	97 #

98 -#LIBTCL = -ltcl -lm -ldl	98 -#LIBTCL = -ltcl -lm -ldl

99 -LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl	99 -LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl

100 +LIBTCL = -ltcl8.6 -lm -ldl	100 +LIBTCL = -ltcl8.6 -lm -ldl

101 +#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl	101 +#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl

102 #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt	102 #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt

103 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc	103 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc

104	104

105 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk	105 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk

106 index e6ca1ac..fcc0270 100644	106 index 85ed76a143c1..6feb638b9280 100644

107 --- a/third_party/sqlite/src/main.mk	107 --- a/third_party/sqlite/src/main.mk

108 +++ b/third_party/sqlite/src/main.mk	108 +++ b/third_party/sqlite/src/main.mk

109 @@ -714,7 +714,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/ tool/spaceanal.tcl	109 @@ -760,7 +760,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/ tool/spaceanal.tcl

110 echo "; return zMainloop; }" >> $@	110 echo "; return zMainloop; }" >> $@

111	111

112 sqlite3_analyzer$(EXE): sqlite3_analyzer.c	112 sqlite3_analyzer$(EXE): sqlite3_analyzer.c

113 - $(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(THREADLIB)	113 - $(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(THREADLIB)

114 + $(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) $(THREA DLIB)	114 + $(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) $(THREA DLIB)

115	115

116 # Rules to build the 'testfixture' application.	116 # Rules to build the 'testfixture' application.

117 #	117 #

118 --	118 --

119 2.7.0	119 2.11.0

120	120

OLD	NEW