openpkg/sqlite.patch@3b08e6396b45
openpkg/sqlite.patch
Tue, 28 Aug 2012 18:28:45 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:28:45 +0200
- changeset 528
- 3b08e6396b45
- permissions
- -rw-r--r--
Massively update from 5.1 to 5.5 release, completely changing from
autotools to cmake build configuration along with the corresponding
corrections. Correct some less important problems like typical german
english mistakes, as well as use parallel make for faster builds with
SMP and multicore architectures. Warning, the 5.5 releases of MySQL
seem to be equally bug ridden as the 5.1 are, for example building
the NDBCluster storage engine fails.
1 Index: Makefile.in
2 --- Makefile.in.orig 2009-07-06 16:29:57 +0200
3 +++ Makefile.in 2009-08-12 20:12:13 +0200
4 @@ -187,6 +187,17 @@
5 USE_AMALGAMATION = @USE_AMALGAMATION@
6 LIBOBJ = $(OBJS$(USE_AMALGAMATION))
8 +# FTS3 support
9 +ifdef FTS3
10 +TCC += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3
11 +LIBOBJ += fts3.lo fts3_hash.lo fts3_expr.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo
12 +endif
13 +
14 +# RTREE support
15 +ifdef RTREE
16 +TCC += -DSQLITE_ENABLE_RTREE -I$(TOP)/ext/rtree
17 +LIBOBJ += rtree.lo
18 +endif
20 # All of the source code files.
21 #
22 @@ -477,6 +488,24 @@
23 -o $@ $(TOP)/src/shell.c libsqlite3.la \
24 $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
26 +fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR)
27 + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
28 +fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR)
29 + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
30 +fts3_expr.lo: $(TOP)/ext/fts3/fts3_expr.c $(HDR)
31 + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_expr.c
32 +fts3_icu.lo: $(TOP)/ext/fts3/fts3_icu.c $(HDR)
33 + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_icu.c
34 +fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR)
35 + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c
36 +fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR)
37 + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c
38 +fts3_tokenizer1.lo: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
39 + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
40 +
41 +rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR)
42 + $(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c
43 +
44 # This target creates a directory named "tsrc" and fills it with
45 # copies of all of the C source code and header files needed to
46 # build on the target system. Some of the C source code and header
47 Index: configure
48 --- configure.orig 2009-08-01 17:04:20 +0200
49 +++ configure 2009-08-12 20:12:13 +0200
50 @@ -6012,11 +6012,7 @@
51 if $ac_preproc_ok; then
52 :
53 else
54 - { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
55 -See \`config.log' for more details." >&5
56 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
57 -See \`config.log' for more details." >&2;}
58 - { (exit 1); exit 1; }; }
59 + :
60 fi
62 ac_ext=c
63 Index: sqlite3.pc.in
64 --- sqlite3.pc.in.orig 2009-05-05 05:39:51 +0200
65 +++ sqlite3.pc.in 2009-08-12 20:12:13 +0200
66 @@ -8,6 +8,5 @@
67 Name: SQLite
68 Description: SQL database engine
69 Version: @RELEASE@
70 -Libs: -L${libdir} -lsqlite3
71 -Libs.private: @LIBS@
72 +Libs: -L${libdir} -lsqlite3 @LIBS@
73 Cflags: -I${includedir}
