[patch] Portage overlay for sqlite 3.5.4., second attempt

dev-db_sqlite-3.5.4-r99.patch (text/plain), 6.42 KB, created by D.Raisin on 2008-01-27 19:21:22 UTC

diff -Pru dev-db.old/sqlite/files/fts3.patch dev-db/sqlite/files/fts3.patch
--- dev-db.old/sqlite/files/fts3.patch	1970-01-01 01:00:00.000000000 +0100
+++ dev-db/sqlite/files/fts3.patch	2008-01-27 15:39:45.000000000 +0100
@@ -0,0 +1,137 @@
+diff -ru ../sqlite-3.5.4.old/Makefile.in ./Makefile.in
+--- ../sqlite-3.5.4.old/Makefile.in	2007-12-13 19:17:41.000000000 +0100
++++ ./Makefile.in	2008-01-27 15:30:56.000000000 +0100
+@@ -111,6 +111,11 @@
+ LTLINK = $(LIBTOOL) --mode=link $(TCC) @LDFLAGS@
+ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
++# FTS3
++#
++TCC += -DSQLITE_CORE
++TCC += -DSQLITE_ENABLE_FTS3=1
++
+ # nawk compatible awk.
+ NAWK = @AWK@
+ 
+@@ -132,6 +137,11 @@
+          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 += \
++  fts3.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer.lo fts3_tokenizer1.lo
++
+ # All of the source code files.
+ #
+ SRC = \
+@@ -199,17 +209,17 @@
+   $(TOP)/src/vtab.c \
+   $(TOP)/src/where.c
+ 
+-# Source code for extensions
++# Source code for FTS3 extension
+ #
+ SRC += \
+-  $(TOP)/ext/fts1/fts1.c \
+-  $(TOP)/ext/fts1/fts1.h \
+-  $(TOP)/ext/fts1/fts1_hash.c \
+-  $(TOP)/ext/fts1/fts1_hash.h \
+-  $(TOP)/ext/fts1/fts1_porter.c \
+-  $(TOP)/ext/fts1/fts1_tokenizer.h \
+-  $(TOP)/ext/fts1/fts1_tokenizer1.c
+-
++  $(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_tokenizer.c \
++  $(TOP)/ext/fts3/fts3_tokenizer1.c
+ 
+ # Source code to the test files.
+ #
+@@ -282,9 +292,9 @@
+ # Header files used by extensions
+ #
+ HDR += \
+-  $(TOP)/ext/fts1/fts1.h \
+-  $(TOP)/ext/fts1/fts1_hash.h \
+-  $(TOP)/ext/fts1/fts1_tokenizer.h
++  $(TOP)/ext/fts3/fts3.h \
++  $(TOP)/ext/fts3/fts3_hash.h \
++  $(TOP)/ext/fts3/fts3_tokenizer.h
+ 
+ # Header files used by the VDBE submodule
+ #
+@@ -627,3 +637,21 @@
+ sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
+ 	$(TCC) -shared -o sqlite3.dll sqlite3.def \
+ 		-Wl,"--strip-all" $(REAL_LIBOBJ)
++
++#
++# FTS3
++#
++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
+diff -ru ../sqlite-3.5.4.old/src/loadext.c ./src/loadext.c
+--- ../sqlite-3.5.4.old/src/loadext.c	2007-11-30 02:28:11.000000000 +0100
++++ ./src/loadext.c	2008-01-27 15:27:36.000000000 +0100
+@@ -12,7 +12,15 @@
+ ** This file contains code used to dynamically load extensions into
+ ** the SQLite library.
+ */
+-#ifndef SQLITE_OMIT_LOAD_EXTENSION
++#ifdef SQLITE_OMIT_LOAD_EXTENSION
++
++#warning GENTOO TWEAK
++#ifndef SQLITE_EXTENSION_INIT1
++#define SQLITE_EXTENSION_INIT1
++#define SQLITE_EXTENSION_INIT2(v)
++#endif
++
++#else
+ 
+ #define SQLITE_CORE 1  /* Disable the API redefinition in sqlite3ext.h */
+ #include "sqlite3ext.h"
+diff -ru ../sqlite-3.5.4.old/tool/mksqlite3c.tcl ./tool/mksqlite3c.tcl
+--- ../sqlite-3.5.4.old/tool/mksqlite3c.tcl	2007-11-30 02:28:13.000000000 +0100
++++ ./tool/mksqlite3c.tcl	2008-01-27 14:40:13.000000000 +0100
+@@ -102,6 +102,11 @@
+    sqliteLimit.h
+    vdbe.h
+    vdbeInt.h
++
++   fts3.h
++   fts3_hash.h
++   fts3_tokenizer.h
++
+ } {
+   set available_hdr($hdr) 1
+ }
+@@ -259,6 +264,12 @@
+    tokenize.c
+    complete.c
+ 
++   fts3.c
++   fts3_hash.c
++   fts3_porter.c
++   fts3_tokenizer.c
++   fts3_tokenizer1.c
++
+    main.c
+ } {
+   copy_file tsrc/$file
diff -Pru dev-db.old/sqlite/sqlite-3.5.4-r99.ebuild dev-db/sqlite/sqlite-3.5.4-r99.ebuild
--- dev-db.old/sqlite/sqlite-3.5.4-r99.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ dev-db/sqlite/sqlite-3.5.4-r99.ebuild	2008-01-27 15:41:49.000000000 +0100
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild,v 1.4 2008/01/14 11:24:00 vapier Exp $
+
+EAPI="1"
+
+inherit versionator alternatives eutils flag-o-matic libtool
+
+DESCRIPTION="an SQL Database Engine in a C Library"
+HOMEPAGE="http://www.sqlite.org/"
+DOC_PV=$(replace_all_version_separators _)
+SRC_URI="http://www.sqlite.org/${P}.tar.gz
+	doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
+
+LICENSE="as-is"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="debug doc soundex tcl +threadsafe fts3"
+RESTRICT="!tcl? ( test )"
+
+DEPEND="tcl? ( dev-lang/tcl )"
+RDEPEND="${DEPEND}"
+
+SOURCE="/usr/bin/lemon"
+ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
+
+pkg_setup() {
+	# test
+	if has test ${FEATURES}; then
+		if ! has userpriv ${FEATURES}; then
+			ewarn "The userpriv feature must be enabled to run tests."
+			eerror "Testsuite will not be run."
+		fi
+		if ! use tcl; then
+			ewarn "You must enable the tcl use flag if you want to run the testsuite."
+			eerror "Testsuite will not be run."
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/sandbox-fix2.patch
+
+	use fts3 && epatch "${FILESDIR}"/fts3.patch
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	# not available via configure and requested in bug #143794
+	use soundex && append-flags -DSQLITE_SOUNDEX=1
+
+        # Dietrich's extension:
+        use fts3 && append-flags -DSQLITE_ENABLE_FTS3=1
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable threadsafe) \
+		$(use_enable threadsafe cross-thread-connections) \
+		$(use_enable tcl) \
+		|| die
+	emake all || die "emake all failed"
+}
+
+src_test() {
+	if use tcl ; then
+		if has userpriv ${FEATURES} ; then
+			if use debug ; then
+				emake fulltest || die "some test failed"
+			else
+				emake test || die "some test failed"
+			fi
+		fi
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		TCLLIBDIR="/usr/$(get_libdir)" \
+		install \
+		|| die "emake install failed"
+
+	newbin lemon lemon-${SLOT} || die
+
+	dodoc README VERSION || die
+	doman sqlite3.1 || die
+
+	dohtml doc/*.html art/*.gif || die
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/${PN}_docs_${DOC_PV}/* || die
+	fi
+}