8000 update baseline to sqlite version 3.6.1 · codeguru85/sqlcipher@2893a5d · GitHub
[go: up one dir, main page]
Skip to content

Commit 2893a5d

Browse files
sjlombardosjlombardo
committed
update baseline to sqlite version 3.6.1
1 parent 617ed01 commit 2893a5d

File tree

139 files changed

+7728
-2209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+7728
-2209
lines changed

‎Makefile.arm-wince-mingw32ce-gcc

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
#!/usr/make
2+
#
3+
# Makefile for SQLITE
4+
#
5+
# This is a template makefile for SQLite. Most people prefer to
6+
# use the autoconf generated "configure" script to generate the
7+
# makefile automatically. But that does not work for everybody
8+
# and in every situation. If you are having problems with the
9+
# "configure" script, you might want to try this makefile as an
10+
# alternative. Create a copy of this file, edit the parameters
11+
# below and type "make".
12+
#
13+
14+
#### The directory where to find the mingw32ce tools
15+
MINGW32CE = /opt/mingw32ce/bin
16+
17+
#### The target prefix of the mingw32ce tools
18+
TARGET = arm-wince-mingw32ce
19+
20+
#### The toplevel directory of the source tree. This is the directory
21+
# that contains this "Makefile.in" and the "configure.in" script.
22+
#
23+
TOP = ../sqlite
24+
25+
#### C Compiler and options for use in building executables that
26+
# will run on the platform that is doing the build.
27+
#
28+
BCC = gcc -g -O2
29+
#BCC = /opt/ancic/bin/c89 -0
30+
31+
#### If the target operating system supports the "usleep()" system
32+
# call, then define the HAVE_USLEEP macro for all C modules.
33+
#
34+
USLEEP =
35+
#USLEEP = -DHAVE_USLEEP=1
36+
37+
#### If you want the SQLite library to be safe for use within a
38+
# multi-threaded program, then define the following macro
39+
# appropriately:
40+
#
41+
THREADSAFE = -DTHREADSAFE=1
42+
#THREADSAFE = -DTHREADSAFE=0
43+
44+
#### Specify any extra linker options needed to make the library
45+
# thread safe
46+
#
47+
#THREADLIB = -lpthread
48+
THREADLIB =
49+
50+
#### Specify any extra libraries needed to access required functions.
51+
#
52+
#TLIBS = -lrt # fdatasync on Solaris 8
53+
TLIBS =
54+
55+
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
56+
# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
57+
# malloc()s and free()s in order to track down memory leaks.
58+
#
59+
# SQLite uses some expensive assert() statements in the inner loop.
60+
# You can make the library go almost twice as fast if you compile
61+
# with -DNDEBUG=1
62+
#
63+
#OPTS = -DSQLITE_DEBUG=2
64+
#OPTS = -DSQLITE_DEBUG=1
65+
#OPTS =
66+
OPTS = -DNDEBUG=1 -DSQLITE_OS_WIN=1 -D_WIN32_WCE=1
67+
#OPTS += -DHAVE_FDATASYNC=1
68+
69+
#### The suffix to add to executable files. ".exe" for windows.
70+
# Nothing for unix.
71+
#
72+
EXE = .exe
73+
#EXE =
74+
75+
#### C Compile and options for use in building executables that
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 -g -O0 -Wall
81+
#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
82+
#TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
83+
TCC = $(MINGW32CE)/$(TARGET)-gcc -O2
84+
#TCC = /opt/ansic/bin/c89 -O +z -Wl,-a,archive
85+
86+
#### Tools used to build a static library.
87+
#
88+
#AR = ar cr
89+
#AR = /opt/mingw/bin/i386-mingw32-ar cr
90+
AR = $(MINGW32CE)/$(TARGET)-ar cr
91+
#RANLIB = ranlib
92+
#RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
93+
RANLIB = $(MINGW32CE)/$(TARGET)-ranlib
94+
95+
#MKSHLIB = gcc -shared
96+
#SO = so
97+
#SHPREFIX = lib
98+
MKSHLIB = $(MINGW32CE)/$(TARGET)-gcc -shared
99+
SO = dll
100+
SHPREFIX =
101+
102+
#### Extra compiler options needed for programs that use the TCL library.
103+
#
104+
#TCL_FLAGS =
105+
#TCL_FLAGS = -DSTATIC_BUILD=1
106+
TCL_FLAGS = -I/home/drh/tcltk/8.4linux
107+
#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
108+
#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
109+
110+
#### Linker options needed to link against the TCL library.
111+
#
112+
#LIBTCL = -ltcl -lm -ldl
113+
LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
114+
#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
115+
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
116+
117+
#### Additional objects for SQLite library when TCL support is enabled.
118+
TCLOBJ =
119+
#TCLOBJ = tclsqlite.o
120+
121+
#### Compiler options needed for programs that use the readline() library.
122+
#
123+
READLINE_FLAGS =
124+
#READLINE_FLAGS = -DHAVE_READLINE=1 -I/usr/include/readline
125+
126+
#### Linker options needed by programs using readline() must link against.
127+
#
128+
LIBREADLINE =
129+
#LIBREADLINE = -static -lreadline -ltermcap
130+
131+
#### Which "awk" program provides nawk compatibilty
132+
#
133+
# NAWK = nawk
134+
NAWK = awk
135+
136+
# You should not have to change anything below this line
137+
###############################################################################
138+
include $(TOP)/main.mk

‎Makefile.in

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,13 @@ TLIBS = @LIBS@
7575
#
7676
TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@
7777

78-
# Enable/disable loadable extensions based on configuration
79-
TCC += @LOADEXTENSION_FLAGS@
78+
# Enable/disable loadable extensions, and other optional features
79+
# based on configuration. (-DSQLITE_OMIT*). The same set of OMIT
80+
# flags should be passed to the LEMON parser generator and the
81+
# mkkeywordhash tool as well.
82+
OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@
83+
84+
TCC += $(OPT_FEATURE_FLAGS)
8085

8186
# Version numbers and release number for the SQLite being compiled.
8287
#
@@ -130,6 +135,7 @@ LTLINK_EXTRAS += $(GCOV_LDFLAGS$(USE_GCOV))
130135
prefix = @prefix@
131136
exec_prefix = @exec_prefix@
132137
libdir = @libdir@
138+
pkgconfigdir = $(libdir)/pkgconfig
133139
bindir = @bindir@
134140
includedir = @includedir@
135141
INSTALL = @INSTALL@
@@ -153,8 +159,8 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
153159
btree.lo build.lo callback.lo complete.lo date.lo \
154160
delete.lo expr.lo fault.lo func.lo global.lo \
155161
hash.lo journal.lo insert.lo loadext.lo \
156-
main.lo malloc.lo mem1.lo mem2.lo mem3.lo mem4.lo mem5.lo mutex.lo \
157-
mutex_os2.lo mutex_unix.lo mutex_w32.lo \
162+
main.lo malloc.lo mem1.lo mem2.lo mem3.lo mem4.lo mem5.lo mem6.lo \
163+
mutex.lo mutex_os2.lo mutex_unix.lo mutex_w32.lo \
158164
opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
159165
pager.lo parse.lo pragma.lo prepare.lo printf.lo random.lo \
160166
select.lo status.lo table.lo tokenize.lo trigger.lo update.lo \
@@ -207,6 +213,7 @@ SRC = \
207213
$(TOP)/src/mem3.c \
208214
$(TOP)/src/mem4.c \
209215
$(TOP)/src/mem5.c \
216+
$(TOP)/src/mem6.c \
210217
$(TOP)/src/mutex.c \
211218
$(TOP)/src/mutex.h \
212219
$(TOP)/src/mutex_os2.c \
@@ -427,7 +434,7 @@ libsqlite3.la: $(LIBOBJ)
427434

428435
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
429436
$(LTLINK) -o $@ tclsqlite.lo \
430-
$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \
437+
libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
431438
-rpath "$(libdir)/sqlite" \
432439
-version-info "8:6:8"
433440

@@ -550,6 +557,9 @@ mem4.lo: $(TOP)/src/mem4.c $(HDR)
550557
mem5.lo: $(TOP)/src/mem5.c $(HDR)
551558
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mem5.c
552559

560+
mem6.lo: $(TOP)/src/mem6.c $(HDR)
561+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mem6.c
562+
553563
mutex.lo: $(TOP)/src/mutex.c $(HDR)
554564
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mutex.c
555565

@@ -593,7 +603,7 @@ parse.h: parse.c
593603

594604
parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopcodes.awk
595605
cp $(TOP)/src/parse.y .
596-
./lemon$(BEXE) $(OPTS) parse.y
606+
./lemon$(BEXE) $(OPTS) $(OPT_FEATURE_FLAGS) parse.y
597607
mv parse.h parse.h.temp
598608
$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
599609

@@ -623,13 +633,13 @@ table.lo: $(TOP)/src/table.c $(HDR)
623633
$(LTCOMPILE) -c $(TOP)/src/table.c
624634

625635
tclsqlite.lo: $(TOP)/src/tclsqlite.c $(HDR)
626-
$(LTCOMPILE) -c $(TOP)/src/tclsqlite.c
636+
$(LTCOMPILE) -DUSE_TCL_STUBS=1 -c $(TOP)/src/tclsqlite.c
627637

628638
tokenize.lo: $(TOP)/src/tokenize.c keywordhash.h $(HDR)
629639
$(LTCOMPILE) -c $(TOP)/src/tokenize.c
630640

631641
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
632-
$(BCC) -o mkkeywordhash$(BEXE) $(OPTS) $(TOP)/tool/mkkeywordhash.c
642+
$(BCC) -o mkkeywordhash$(BEXE) $(OPTS) $(OPT_FEATURE_FLAGS) $(TOP)/tool/mkkeywordhash.c
633643
./mkkeywordhash$(BEXE) >keywordhash.h
634644

635645
trigger.lo: $(TOP)/src/trigger.c $(HDR)
@@ -715,8 +725,8 @@ install: sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
715725
$(INSTALL) -d $(DESTDIR)$(includedir)
716726
$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
717727
$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
718-
$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig;
719-
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig;
728+
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
729+
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
720730

721731
tcl_install: libtclsqlite3.la
722732
$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(VERSION)

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.0
1+
3.6.1

‎config.h.in

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*************************************************************************
1212
** Configuration header template to be filled in by 'configure' script
1313
**
14-
** @(#) $Id: config.h.in,v 1.2 2008/05/06 02:28:06 mlcreech Exp $
14+
** @(#) $Id: config.h.in,v 1.3 2008/07/22 05:05:02 shane Exp $
1515
*/
1616
#ifndef _CONFIG_H_
1717
#define _CONFIG_H_
@@ -33,9 +33,6 @@
3333
/* Define as 1 if you have the int64_t type */
3434
#undef HAVE_INT64_T
3535

36-
/* Define as 1 if you have the intptr_t type */
37-
#undef HAVE_INTPTR_T
38-
3936
/* Define as 1 if you have the uint8_t type */
4037
#undef HAVE_UINT8_T
4138

@@ -48,9 +45,6 @@
4845
/* Define as 1 if you have the uint64_t type */
4946
#undef HAVE_UINT64_T
5047

51-
/* Define as 1 if you have the uintptr_t type */
52-
#undef HAVE_UINTPTR_T
53-
5448

5549
/*****************************
5650
** Header Files
@@ -85,6 +79,9 @@
8579
/* Define as 1 if you have the localtime_r() function */
8680
#undef HAVE_LOCALTIME_R
8781

82+
/* Define as 1 if you have the localtime_s() function */
83+
#undef HAVE_LOCALTIME_S
84+
8885

8986
/*****************************
9087
** Large file support

0 commit comments

Comments
 (0)
0