diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-16 22:12:27 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-16 22:12:27 +0000 |
| commit | 11c407171ed565da7a43f3fa3df2a76983acee5a (patch) | |
| tree | 3a2244c8fa4bc3b62f3bded1a4885bfa870d491d | |
| parent | 840f4e98448e84699118db5fbea0cf54bf17d004 (diff) | |
| download | ptxdist-11c407171ed565da7a43f3fa3df2a76983acee5a.tar.gz ptxdist-11c407171ed565da7a43f3fa3df2a76983acee5a.tar.xz | |
[sqlite] Update and small fix
* Update to version 3.6.15
* Add new menu options
* Fix compile be using the --disable-amalgamation which
removes the need for a working TCL
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
[mkl: fixed whitespace issues]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10809 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | rules/sqlite.in | 43 | ||||
| -rw-r--r-- | rules/sqlite.make | 40 |
2 files changed, 80 insertions, 3 deletions
diff --git a/rules/sqlite.in b/rules/sqlite.in index 9afc874f1..a0a796ac6 100644 --- a/rules/sqlite.in +++ b/rules/sqlite.in @@ -30,10 +30,53 @@ config SQLITE_DISABLE_LFS bool prompt "Disable large file support" + +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" + help + Enable loading of external extensions + config SQLITE_READLINE bool prompt "use readline" diff --git a/rules/sqlite.make b/rules/sqlite.make index 1ae87c88a..95132598b 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -2,6 +2,8 @@ # # Copyright (C) 2004 by Ladislav Michl # Copyright (C) 2009 by Juergen Beisert <j.beisert@pengtronix.de> +# Copyright (C) 2009 by Erwin Rol <erwin@erwinrol.com> +# # # See CREDITS for details about who has contributed to this project. # @@ -17,7 +19,7 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite # # Paths and names # -SQLITE_VERSION = 3.6.13 +SQLITE_VERSION = 3.6.15 SQLITE = sqlite-$(SQLITE_VERSION) SQLITE_SUFFIX = tar.gz SQLITE_URL = http://www.sqlite.org/$(SQLITE).$(SQLITE_SUFFIX) @@ -46,8 +48,22 @@ SQLITE_ENV = \ SQLITE_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --enable-tempstore=never \ - --enable-releasemode + --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 ifdef PTXCONF_SQLITE_THREADSAFE SQLITE_AUTOCONF += --enable-threadsafe @@ -55,6 +71,24 @@ 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 +else +SQLITE_AUTOCONF += --disable-load-extension +endif + ifdef PTXCONF_SQLITE_DISABLE_LFS SQLITE_AUTOCONF += --disable-largefile else |