Bump the old SQLite version to the recent one that is recommend by the sqlite developers.
Signed-off-by: Markus Rathgeb <[email protected]> --- rules/sqlite.in | 55 -------------------------------------------- rules/sqlite.make | 66 +++++++++++----------------------------------------- 2 files changed, 14 insertions(+), 107 deletions(-) diff --git a/rules/sqlite.in b/rules/sqlite.in index 94c90eb..9f05d10 100644 --- a/rules/sqlite.in +++ b/rules/sqlite.in @@ -10,65 +10,16 @@ menuconfig SQLITE help SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. - Note: This package needs a host tclsh to be built. if SQLITE comment "build options" -#choice -# prompt "Assume text encoding" -# default ISO8859 -# -# config SQLITE_ISO8859 -# bool -# prompt "ISO8859" -# -# config SQLITE_UTF8 -# bool -# prompt "UTF-8" -#endchoice - -choice - prompt "Temp. RAM storage" - default SQLITE_TEMPSTORE_NEVER - - config SQLITE_TEMPSTORE_NEVER - bool - prompt "never" - - config SQLITE_TEMPSTORE_NO - bool - prompt "no" - - config SQLITE_TEMPSTORE_YES - bool - prompt "yes" - - config SQLITE_TEMPSTORE_ALWAYS - bool - prompt "always" - -endchoice - - config SQLITE_THREADSAFE bool prompt "Safe for use within a multi-threaded program" -config SQLITE_CROSS_THREAD_CONNECTIONS - bool - prompt "Thread connection sharing" - help - Allow connection sharing across threads - -config SQLITE_THREAD_OVERRIDE_LOCKS - bool - prompt "Thread override locks" - help - Threads can override each others locks - config SQLITE_LOAD_EXTENTION bool prompt "external extensions" @@ -81,12 +32,6 @@ config SQLITE_READLINE help Enable readline support -config SQLITE_TCL - bool - prompt "build tcl extension" - help - Build the TCL extension - comment "install options" config SQLITE_TOOL diff --git a/rules/sqlite.make b/rules/sqlite.make index f885ad5..558c07d 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -4,6 +4,7 @@ # 2009 by Juergen Beisert <[email protected]> # 2009 by Erwin Rol <[email protected]> # 2010 by Marc Kleine-Budde <[email protected]> +# 2011 by Markus Rathgeb <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -19,8 +20,14 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite # # Paths and names # -SQLITE_VERSION := 3.6.22 +# version: 3.7.5 +SQLITE_VERSION := 3070500 +SQLITE_TYPE := autoconf +ifeq ($(SQLITE_TYPE),) SQLITE := sqlite-$(SQLITE_VERSION) +else +SQLITE := sqlite-$(SQLITE_TYPE)-$(SQLITE_VERSION) +endif SQLITE_SUFFIX := tar.gz SQLITE_URL := http://www.sqlite.org/$(SQLITE).$(SQLITE_SUFFIX) SQLITE_SOURCE := $(SRCDIR)/$(SQLITE).$(SQLITE_SUFFIX) @@ -42,30 +49,12 @@ SQLITE_PATH := PATH=$(CROSS_PATH) # don't use := here! SQLITE_ENV = \ - $(CROSS_ENV) \ - TCLLIBDIR=/usr/lib/tcl$(TCL_MAJOR).$(TCL_MINOR)/sqlite3 + $(CROSS_ENV) SQLITE_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ - --enable-releasemode \ - --disable-amalgamation - -ifdef PTXCONF_SQLITE_TEMPSTORE_NEVER -SQLITE_AUTOCONF += --enable-tempstore=never -endif - -ifdef PTXCONF_SQLITE_TEMPSTORE_NO -SQLITE_AUTOCONF += --enable-tempstore=no -endif - -ifdef PTXCONF_SQLITE_TEMPSTORE_YES -SQLITE_AUTOCONF += --enable-tempstore=yes -endif - -ifdef PTXCONF_SQLITE_TEMPSTORE_ALWAYS -SQLITE_AUTOCONF += --enable-tempstore=always -endif + --disable-static ifdef PTXCONF_SQLITE_THREADSAFE SQLITE_AUTOCONF += --enable-threadsafe @@ -73,36 +62,15 @@ else SQLITE_AUTOCONF += --disable-threadsafe endif -ifdef PTXCONF_SQLITE_CROSS_THREAD_CONNECTIONS -SQLITE_AUTOCONF += --enable-cross-thread-connections -else -SQLITE_AUTOCONF += --disable-cross-thread-connections -endif - -ifdef PTXCONF_SQLITE_THREAD_OVERRIDE_LOCKS -SQLITE_AUTOCONF += --enable-threads-override-locks -else -SQLITE_AUTOCONF += --disable-threads-override-locks -endif - ifdef PTXCONF_SQLITE_LOAD_EXTENTION -SQLITE_AUTOCONF += --enable-load-extension +SQLITE_AUTOCONF += --enable-dynamic-extensions else -SQLITE_AUTOCONF += --disable-load-extension -endif - -ifdef PTXCONF_SQLITE_TCL -SQLITE_AUTOCONF += \ - --enable-tcl \ - --with-tcl="$(SYSROOT)/usr/lib" -else -SQLITE_AUTOCONF += --disable-tcl +SQLITE_AUTOCONF += --disable-dynamic-extensions endif ifdef PTXCONF_SQLITE_READLINE SQLITE_AUTOCONF += \ - --enable-readline \ - --with-readline-inc="-I$(SYSROOT)/include/readline" + --enable-readline else SQLITE_AUTOCONF += --disable-readline endif @@ -120,18 +88,12 @@ $(STATEDIR)/sqlite.targetinstall: @$(call install_fixup, sqlite,AUTHOR,"Ladislav Michl <[email protected]>") @$(call install_fixup, sqlite,DESCRIPTION,missing) - @$(call install_lib, sqlite, 0, 0, 0644, libsqlite3-$(SQLITE_VERSION)) + @$(call install_lib, sqlite, 0, 0, 0644, libsqlite3) ifdef PTXCONF_SQLITE_TOOL @$(call install_copy, sqlite, 0, 0, 0755, -, /usr/bin/sqlite3) endif -ifdef PTXCONF_SQLITE_TCL - @$(call install_copy, sqlite, 0, 0, 0644, -, \ - /usr/lib/tcl$(TCL_MAJOR).$(TCL_MINOR)/sqlite3/libtclsqlite3.so) - @$(call install_copy, sqlite, 0, 0, 0644, -, \ - /usr/lib/tcl$(TCL_MAJOR).$(TCL_MINOR)/sqlite3/pkgIndex.tcl) -endif @$(call install_finish, sqlite) @$(call touch) -- 1.7.4.1 -- ptxdist mailing list [email protected]
