From: <abe...@us...> - 2016-01-08 17:48:59
|
Revision: 7447 http://sourceforge.net/p/astlinux/code/7447 Author: abelbeck Date: 2016-01-08 17:48:56 +0000 (Fri, 08 Jan 2016) Log Message: ----------- sqlite, version bump to 3.10.0 Modified Paths: -------------- branches/1.0/package/sqlite/sqlite.mk Removed Paths: ------------- branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch Deleted: branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch =================================================================== --- branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch 2016-01-08 16:56:52 UTC (rev 7446) +++ branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch 2016-01-08 17:48:56 UTC (rev 7447) @@ -1,61 +0,0 @@ -Index: sqlite-3090200/Makefile.am -================================================================== ---- sqlite-3090200/Makefile.am -+++ sqlite-3090200/Makefile.am -@@ -4,16 +4,18 @@ - lib_LTLIBRARIES = libsqlite3.la - libsqlite3_la_SOURCES = sqlite3.c - libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 - - bin_PROGRAMS = sqlite3 --sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h --sqlite3_LDADD = @READLINE_LIBS@ -+sqlite3_SOURCES = shell.c sqlite3.h -+EXTRA_sqlite3_SOURCES = sqlite3.c -+sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ -+sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ - sqlite3_CFLAGS = $(AM_CFLAGS) - - include_HEADERS = sqlite3.h sqlite3ext.h - - EXTRA_DIST = sqlite3.1 tea - pkgconfigdir = ${libdir}/pkgconfig - pkgconfig_DATA = sqlite3.pc - - man_MANS = sqlite3.1 - -Index: sqlite-3090200/configure.ac -================================================================== ---- sqlite-3090200/configure.ac.orig 2015-11-02 12:44:06.000000000 -0600 -+++ sqlite-3090200/configure.ac 2015-11-13 12:18:14.000000000 -0600 -@@ -4,6 +4,8 @@ - # - # --enable-threadsafe - # --enable-readline -+# --enable-editline -+# --enable-static-shell - # --enable-dynamic-extensions - # - -@@ -103,6 +105,21 @@ - AC_SUBST(JSON1_FLAGS) - #----------------------------------------------------------------------- - -+#----------------------------------------------------------------------- -+# --enable-static-shell -+# -+AC_ARG_ENABLE(static-shell, [AS_HELP_STRING( -+ [--enable-static-shell], -+ [statically link libsqlite3 into shell tool [default=yes]])], -+ [], [enable_static_shell=yes]) -+if test x"$enable_static_shell" == "xyes"; then -+ EXTRA_SHELL_OBJ=sqlite3.$OBJEXT -+else -+ EXTRA_SHELL_OBJ=libsqlite3.la -+fi -+AC_SUBST(EXTRA_SHELL_OBJ) -+#----------------------------------------------------------------------- -+ - AC_CHECK_FUNCS(posix_fallocate) - - #----------------------------------------------------------------------- Modified: branches/1.0/package/sqlite/sqlite.mk =================================================================== --- branches/1.0/package/sqlite/sqlite.mk 2016-01-08 16:56:52 UTC (rev 7446) +++ branches/1.0/package/sqlite/sqlite.mk 2016-01-08 17:48:56 UTC (rev 7447) @@ -4,9 +4,9 @@ # ############################################################# -SQLITE_VERSION = 3090200 +SQLITE_VERSION = 3100000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz -SQLITE_SITE = http://www.sqlite.org/2015 +SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_INSTALL_STAGING = YES # required with sqlite-dynamically-link-shell-tool.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |