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: 18-Dec-2006 09:22:28
Branch: HEAD Handle: 2006121808222800
Modified files:
openpkg-src/sqlite sqlite.patch sqlite.spec
Log:
add optional FTS1 (Full-Text Search Version 1) support; remove old and
incorrectly applied LIBPTHREAD hack
Summary:
Revision Changes Path
1.13 +76 -0 openpkg-src/sqlite/sqlite.patch
1.118 +8 -5 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 10 Jun 2006 11:05:24 -0000 1.12
+++ openpkg-src/sqlite/sqlite.patch 18 Dec 2006 08:22:28 -0000 1.13
@@ -22,3 +22,79 @@
-Libs: -L${libdir} -lsqlite3
+Libs: -L${libdir} -lsqlite3 @TARGET_LIBS@
Cflags: -I${includedir}
+Index: Makefile.in
+--- Makefile.in.orig 2006-10-03 14:40:42 +0200
++++ Makefile.in 2006-12-18 09:11:09 +0100
+@@ -132,6 +132,12 @@
+ vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
+ where.lo utf.lo legacy.lo vtab.lo
+
++# FTS1 support
++ifdef FTS1
++TCC += -DSQLITE_ENABLE_FTS1
++LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
++endif
++
+ # All of the source code files.
+ #
+ SRC = \
+@@ -481,6 +487,14 @@
+ -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
+ libsqlite3.la $(LIBTCL)
+
++fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
++fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
++fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
++fts1_tokenizer1.lo: $(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
+
+ fulltest: testfixture$(TEXE) sqlite3$(TEXE)
+ ./testfixture $(TOP)/test/all.test
+Index: ext/fts1/fts1.c
+--- ext/fts1/fts1.c.orig 2006-10-08 13:16:32 +0200
++++ ext/fts1/fts1.c 2006-12-18 09:04:08 +0100
+@@ -19,11 +19,7 @@
+ #endif
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#else
+ #include <stdlib.h>
+-#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+Index: ext/fts1/fts1_porter.c
+--- ext/fts1/fts1_porter.c.orig 2006-10-01 20:01:13 +0200
++++ ext/fts1/fts1_porter.c 2006-12-18 09:04:19 +0100
+@@ -26,11 +26,7 @@
+
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#else
+ #include <stdlib.h>
+-#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+Index: ext/fts1/fts1_tokenizer1.c
+--- ext/fts1/fts1_tokenizer1.c.orig 2006-09-30 15:57:33 +0200
++++ ext/fts1/fts1_tokenizer1.c 2006-12-18 09:04:31 +0100
+@@ -18,11 +18,7 @@
+
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#else
+ #include <stdlib.h>
+-#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.117 -r1.118 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 14 Oct 2006 07:47:58 -0000 1.117
+++ openpkg-src/sqlite/sqlite.spec 18 Dec 2006 08:22:28 -0000 1.118
@@ -37,13 +37,14 @@
Group: Database
License: PD
Version: %{V_v3}
-Release: 20061014
+Release: 20061218
# package options
%option with_v2 yes
%option with_utf8 no
%option with_assert no
%option with_readline no
+%option with_fts1 no
# list of sources
Source0: http://www.sqlite.org/sqlite-%{V_v3}.tar.gz
@@ -147,11 +148,13 @@
-e 's;-DNDEBUG;;' \
Makefile
%endif
-%if "%{with_v2}" == "yes"
- %{l_make} %{l_mflags -O}
-%else
- %{l_make} %{l_mflags -O} LIBPTHREAD=""
+ MFLAGS=""
+%if "%{with_fts1}" == "yes"
+ case $v in
+ 3.* ) MFLAGS="$MFLAGS FTS1=1" ;;
+ esac
%endif
+ %{l_make} %{l_mflags -O} $MFLAGS
) || exit $?
done
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
