[arch-commits] CVS update of extra/lib/sqlite3 (2 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Feb 2 17:17:39 UTC 2008
Date: Saturday, February 2, 2008 @ 12:17:39
Author: andyrtr
Path: /home/cvs-extra/extra/lib/sqlite3
Added: build_fts_as_part_of_libsqlite.patch (1.1)
Modified: PKGBUILD (1.35 -> 1.36)
upgpkg: sqlite3 3.5.5-1
also fixed #6217
--------------------------------------+
PKGBUILD | 18 ++--
build_fts_as_part_of_libsqlite.patch | 139 +++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+), 6 deletions(-)
Index: extra/lib/sqlite3/PKGBUILD
diff -u extra/lib/sqlite3/PKGBUILD:1.35 extra/lib/sqlite3/PKGBUILD:1.36
--- extra/lib/sqlite3/PKGBUILD:1.35 Sat Dec 15 14:15:45 2007
+++ extra/lib/sqlite3/PKGBUILD Sat Feb 2 12:17:38 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.35 2007/12/15 19:15:45 andyrtr Exp $
+# $Id: PKGBUILD,v 1.36 2008/02/02 17:17:38 andyrtr Exp $
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
pkgname=sqlite3
-pkgver=3.5.4
+pkgver=3.5.5
pkgrel=1
pkgdesc="A C library that implements an SQL database engine"
arch=('i686' 'x86_64')
@@ -11,16 +11,22 @@
depends=('readline')
conflicts=('sqlite')
replaces=('sqlite')
-source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz license.txt)
+source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz license.txt
+ build_fts_as_part_of_libsqlite.patch)
options=(!libtool)
-md5sums=('f17da840eed792e896c3408d0ce97718'
- 'c1cdbc5544034d9012e421e75a5e4890')
+md5sums=('1174fc9074db2aa49bd17f3dc2607067'
+ 'c1cdbc5544034d9012e421e75a5e4890'
+ '1a24b7334d4d338deaa6552f49106a41')
build() {
cd $startdir/src/sqlite-$pkgver
+ # include fts123 - fixes #6217 patch taken from
+ # http://www.sqlite.org/cvstrac/tktview?tn=2791,35
+ patch -Np0 -i ../build_fts_as_part_of_libsqlite.patch || return 1
./configure --prefix=/usr --enable-threadsafe
make || return 1
make DESTDIR=$startdir/pkg install
+
# license
install -Dm644 $startdir/src/license.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt
-}
+}
\ No newline at end of file
Index: extra/lib/sqlite3/build_fts_as_part_of_libsqlite.patch
diff -u /dev/null extra/lib/sqlite3/build_fts_as_part_of_libsqlite.patch:1.1
--- /dev/null Sat Feb 2 12:17:39 2008
+++ extra/lib/sqlite3/build_fts_as_part_of_libsqlite.patch Sat Feb 2 12:17:39 2008
@@ -0,0 +1,139 @@
+Index: Makefile.in
+===================================================================
+RCS file: /sqlite/sqlite/Makefile.in,v
+retrieving revision 1.186
+diff -u -3 -p -r1.186 Makefile.in
+--- Makefile.in 23 Nov 2007 15:12:44 -0000 1.186
++++ Makefile.in 23 Nov 2007 19:27:56 -0000
+@@ -114,6 +114,23 @@ LTINSTALL = $(LIBTOOL) --mode=install $(
+ # nawk compatible awk.
+ NAWK = @AWK@
+
++# Need these defined unconditionally, as non-fts builds with
++# fts object files without using -DSQLITE_ENABLE_FTS[123]
++# will not work without it.
++#
++TCC += -DSQLITE_CORE
++TCC += -DSQLITE_ENABLE_BROKEN_FTS1
++TCC += -DSQLITE_ENABLE_BROKEN_FTS2
++
++# uncomment to build fts1 as part of library
++# TCC += -DSQLITE_ENABLE_FTS1=1
++
++# uncomment to build fts2 as part of library
++# TCC += -DSQLITE_ENABLE_FTS2=1
++
++# uncomment to build fts3 as part of library
++# TCC += -DSQLITE_ENABLE_FTS3=1
++
+ # You should not have to change anything below this line
+ ###############################################################################
+ TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
+@@ -132,6 +149,17 @@ LIBOBJ = alter.lo analyze.lo attach.lo a
+ vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
+ where.lo utf.lo legacy.lo vtab.lo
+
++# Object files for FTS
++#
++LIBOBJ += \
++ fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
++
++LIBOBJ += \
++ fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
++
++LIBOBJ += \
++ fts3.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer.lo fts3_tokenizer1.lo
++
+ # All of the source code files.
+ #
+ SRC = \
+@@ -209,6 +237,23 @@ SRC += \
+ $(TOP)/ext/fts1/fts1_tokenizer.h \
+ $(TOP)/ext/fts1/fts1_tokenizer1.c
+
++SRC += \
++ $(TOP)/ext/fts2/fts2.c \
++ $(TOP)/ext/fts2/fts2.h \
++ $(TOP)/ext/fts2/fts2_hash.c \
++ $(TOP)/ext/fts2/fts2_hash.h \
++ $(TOP)/ext/fts2/fts2_porter.c \
++ $(TOP)/ext/fts2/fts2_tokenizer.h \
++ $(TOP)/ext/fts2/fts2_tokenizer1.c
++
++SRC += \
++ $(TOP)/ext/fts3/fts3.c \
++ $(TOP)/ext/fts3/fts3.h \
++ $(TOP)/ext/fts3/fts3_hash.c \
++ $(TOP)/ext/fts3/fts3_hash.h \
++ $(TOP)/ext/fts3/fts3_porter.c \
++ $(TOP)/ext/fts3/fts3_tokenizer.h \
++ $(TOP)/ext/fts3/fts3_tokenizer1.c
+
+ # Source code to the test files.
+ #
+@@ -285,6 +330,16 @@ HDR += \
+ $(TOP)/ext/fts1/fts1_hash.h \
+ $(TOP)/ext/fts1/fts1_tokenizer.h
+
++HDR += \
++ $(TOP)/ext/fts2/fts2.h \
++ $(TOP)/ext/fts2/fts2_hash.h \
++ $(TOP)/ext/fts2/fts2_tokenizer.h
++
++HDR += \
++ $(TOP)/ext/fts3/fts3.h \
++ $(TOP)/ext/fts3/fts3_hash.h \
++ $(TOP)/ext/fts3/fts3_tokenizer.h
++
+ # Header files used by the VDBE submodule
+ #
+ VDBEHDR = \
+@@ -616,3 +671,48 @@ sqlite3.def: $(REAL_LIBOBJ)
+ sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
+ $(TCC) -shared -o sqlite3.dll sqlite3.def \
+ -Wl,"--strip-all" $(REAL_LIBOBJ)
++
++#
++# FTS
++#
++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
++
++fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
++
++fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
++
++fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
++
++fts2_tokenizer.lo: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
++
++fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
++ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
++
++fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR)
++ $(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_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
More information about the arch-commits
mailing list