OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jul-2008 09:35:25
Branch: HEAD Handle: 2008071708352400
Modified files:
openpkg-src/sqlite sqlite.patch sqlite.spec
Log:
with_fts1 and with_fts2 are obsolete (SQLite depractes those
extension), with_fts3 has to be fixed and with_rtree was added
Summary:
Revision Changes Path
1.55 +21 -8 openpkg-src/sqlite/sqlite.patch
1.183 +5 -6 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.54 -r1.55 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 17 Jul 2008 07:12:51 -0000 1.54
+++ openpkg-src/sqlite/sqlite.patch 17 Jul 2008 07:35:24 -0000 1.55
@@ -1,32 +1,38 @@
Index: Makefile.in
--- Makefile.in.orig 2008-07-09 01:36:13 +0200
-+++ Makefile.in 2008-07-17 09:09:03 +0200
-@@ -172,6 +172,24 @@
++++ Makefile.in 2008-07-17 09:33:03 +0200
+@@ -172,6 +172,30 @@
LIBOBJ = $(OBJS$(USE_AMALGAMATION))
+# FTS1 support
+ifdef FTS1
-+TCC += -DSQLITE_ENABLE_FTS1
++TCC += -DSQLITE_ENABLE_FTS1 -I$(TOP)/ext/fts1
+LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
+endif
+
+# FTS2 support
+ifdef FTS2
-+TCC += -DSQLITE_ENABLE_FTS2
++TCC += -DSQLITE_ENABLE_FTS2 -I$(TOP)/ext/fts2
+LIBOBJ += fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
+endif
+
+# FTS3 support
+ifdef FTS3
-+TCC += -DSQLITE_ENABLE_FTS3
-+LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer1.lo
++TCC += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3
++LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_icu.lo
fts3_tokenizer1.lo fts3_tokenizer.lo
++endif
++
++# RTREE support
++ifdef RTREE
++TCC += -DSQLITE_ENABLE_RTREE -I$(TOP)/ext/rtree
++LIBOBJ += rtree.lo
+endif
+
# All of the source code files.
#
SRC = \
-@@ -754,3 +772,31 @@
+@@ -754,3 +778,38 @@
sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
$(TCC) -shared -o $@ sqlite3.def \
-Wl,"--strip-all" $(REAL_LIBOBJ)
@@ -53,14 +59,21 @@
+ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
+fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
++fts3_icu.lo: $(TOP)/ext/fts3/fts3_icu.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_icu.c
+fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c
++fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c
+fts3_tokenizer1.lo: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
+
++rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c
++
Index: sqlite3.pc.in
--- sqlite3.pc.in.orig 2008-06-24 03:29:58 +0200
-+++ sqlite3.pc.in 2008-07-17 09:09:03 +0200
++++ sqlite3.pc.in 2008-07-17 09:32:21 +0200
@@ -8,6 +8,5 @@
Name: SQLite
Description: SQL database engine
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.182 -r1.183 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 17 Jul 2008 07:12:51 -0000 1.182
+++ openpkg-src/sqlite/sqlite.spec 17 Jul 2008 07:35:24 -0000 1.183
@@ -43,9 +43,8 @@
%option with_debug no
%option with_readline no
%option with_threads no
-%option with_fts1 no
-%option with_fts2 no
%option with_fts3 no
+%option with_rtree no
%option with_odbc no
%option with_jdbc no
@@ -155,11 +154,11 @@
--disable-amalgamation \
--disable-shared
MFLAGS=""
-%if "%{with_fts1}" == "yes"
- MFLAGS="$MFLAGS FTS1=1"
+%if "%{with_fts3}" == "yes"
+ MFLAGS="$MFLAGS FTS3=1"
%endif
-%if "%{with_fts2}" == "yes"
- MFLAGS="$MFLAGS FTS2=1"
+%if "%{with_rtree}" == "yes"
+ MFLAGS="$MFLAGS RTREE=1"
%endif
%{l_make} %{l_mflags -O} $MFLAGS
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
