From: <abe...@us...> - 2015-11-12 18:13:07
|
Revision: 7324 http://sourceforge.net/p/astlinux/code/7324 Author: abelbeck Date: 2015-11-12 18:13:06 +0000 (Thu, 12 Nov 2015) Log Message: ----------- sqlite, version bump to 3.9.2, added patch to (again) dynamically link shell tool Note: Talking with the sqliteodbc developer Christian Werner, the sqlite version does not necessarily need to match his latest release Modified Paths: -------------- branches/1.0/package/sqlite/sqlite.mk Added Paths: ----------- branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch Added: branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch =================================================================== --- branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch (rev 0) +++ branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch 2015-11-12 18:13:06 UTC (rev 7324) @@ -0,0 +1,11 @@ +--- sqlite-3090200/Makefile.in.orig 2015-11-12 10:34:16.000000000 -0600 ++++ sqlite-3090200/Makefile.in 2015-11-12 10:37:16.000000000 -0600 +@@ -107,7 +107,7 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libsqlite3_la_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(bin_PROGRAMS) +-am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) sqlite3-sqlite3.$(OBJEXT) ++am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) $(top_builddir)/libsqlite3.la + sqlite3_OBJECTS = $(am_sqlite3_OBJECTS) + sqlite3_DEPENDENCIES = + sqlite3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ Modified: branches/1.0/package/sqlite/sqlite.mk =================================================================== --- branches/1.0/package/sqlite/sqlite.mk 2015-11-07 22:34:48 UTC (rev 7323) +++ branches/1.0/package/sqlite/sqlite.mk 2015-11-12 18:13:06 UTC (rev 7324) @@ -4,7 +4,7 @@ # ############################################################# -SQLITE_VERSION = 3080900 +SQLITE_VERSION = 3090200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2015 SQLITE_INSTALL_STAGING = YES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2015-11-13 18:52:52
|
Revision: 7326 http://sourceforge.net/p/astlinux/code/7326 Author: abelbeck Date: 2015-11-13 18:52:50 +0000 (Fri, 13 Nov 2015) Log Message: ----------- sqlite, replace our patch with the official upstream patch that supports --disable-static-shell Ref: http://www.sqlite.org/src/info/499a02a34316cada Modified Paths: -------------- branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch branches/1.0/package/sqlite/sqlite.mk Modified: branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch =================================================================== --- branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch 2015-11-12 18:14:51 UTC (rev 7325) +++ branches/1.0/package/sqlite/sqlite-dynamically-link-shell-tool.patch 2015-11-13 18:52:50 UTC (rev 7326) @@ -1,11 +1,61 @@ ---- sqlite-3090200/Makefile.in.orig 2015-11-12 10:34:16.000000000 -0600 -+++ sqlite-3090200/Makefile.in 2015-11-12 10:37:16.000000000 -0600 -@@ -107,7 +107,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsqlite3_la_LDFLAGS) $(LDFLAGS) -o $@ - PROGRAMS = $(bin_PROGRAMS) --am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) sqlite3-sqlite3.$(OBJEXT) -+am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) $(top_builddir)/libsqlite3.la - sqlite3_OBJECTS = $(am_sqlite3_OBJECTS) - sqlite3_DEPENDENCIES = - sqlite3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +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 2015-11-12 18:14:51 UTC (rev 7325) +++ branches/1.0/package/sqlite/sqlite.mk 2015-11-13 18:52:50 UTC (rev 7326) @@ -9,11 +9,15 @@ SQLITE_SITE = http://www.sqlite.org/2015 SQLITE_INSTALL_STAGING = YES +# required with sqlite-dynamically-link-shell-tool.patch +SQLITE_AUTORECONF = YES + SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" SQLITE_CONF_OPT = \ + --disable-static-shell \ --enable-threadsafe \ --localstatedir=/var This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <abe...@us...> - 2016-03-10 17:35:11
|
Revision: 7583 http://sourceforge.net/p/astlinux/code/7583 Author: abelbeck Date: 2016-03-10 17:35:09 +0000 (Thu, 10 Mar 2016) Log Message: ----------- sqlite, fix regression for: --disable-static-shell Modified Paths: -------------- branches/1.0/package/sqlite/sqlite.mk Added Paths: ----------- branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch Added: branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch =================================================================== --- branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch (rev 0) +++ branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch 2016-03-10 17:35:09 UTC (rev 7583) @@ -0,0 +1,13 @@ +--- sqlite-3110100/Makefile.am.orig 2016-03-10 10:12:23.000000000 -0600 ++++ sqlite-3110100/Makefile.am 2016-03-10 10:14:14.000000000 -0600 +@@ -6,8 +6,8 @@ + 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 ++sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ + sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ + sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS + Modified: branches/1.0/package/sqlite/sqlite.mk =================================================================== --- branches/1.0/package/sqlite/sqlite.mk 2016-03-10 14:56:43 UTC (rev 7582) +++ branches/1.0/package/sqlite/sqlite.mk 2016-03-10 17:35:09 UTC (rev 7583) @@ -9,6 +9,9 @@ SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_INSTALL_STAGING = YES +# required with sqlite-fix-disable-static-shell.patch +SQLITE_AUTORECONF = YES + SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2016-04-17 14:19:30
|
Revision: 7643 http://sourceforge.net/p/astlinux/code/7643 Author: abelbeck Date: 2016-04-17 14:19:27 +0000 (Sun, 17 Apr 2016) Log Message: ----------- sqlite, version bump to 3.12.1 Modified Paths: -------------- branches/1.0/package/sqlite/sqlite.mk Removed Paths: ------------- branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch Deleted: branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch =================================================================== --- branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch 2016-04-17 13:55:08 UTC (rev 7642) +++ branches/1.0/package/sqlite/sqlite-fix-disable-static-shell.patch 2016-04-17 14:19:27 UTC (rev 7643) @@ -1,13 +0,0 @@ ---- sqlite-3110100/Makefile.am.orig 2016-03-10 10:12:23.000000000 -0600 -+++ sqlite-3110100/Makefile.am 2016-03-10 10:14:14.000000000 -0600 -@@ -6,8 +6,8 @@ - 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 -+sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ - sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ - sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS - Modified: branches/1.0/package/sqlite/sqlite.mk =================================================================== --- branches/1.0/package/sqlite/sqlite.mk 2016-04-17 13:55:08 UTC (rev 7642) +++ branches/1.0/package/sqlite/sqlite.mk 2016-04-17 14:19:27 UTC (rev 7643) @@ -4,14 +4,11 @@ # ############################################################# -SQLITE_VERSION = 3110100 +SQLITE_VERSION = 3120100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_INSTALL_STAGING = YES -# required with sqlite-fix-disable-static-shell.patch -SQLITE_AUTORECONF = YES - SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-31 14:50:01
|
Revision: 8251 http://sourceforge.net/p/astlinux/code/8251 Author: abelbeck Date: 2017-03-31 14:49:58 +0000 (Fri, 31 Mar 2017) Log Message: ----------- sqlite, version bump to 3.18.0, fix configure.ac regression Modified Paths: -------------- branches/1.0/package/sqlite/sqlite.mk Added Paths: ----------- branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch Added: branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch =================================================================== --- branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch (rev 0) +++ branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch 2017-03-31 14:49:58 UTC (rev 8251) @@ -0,0 +1,14 @@ +--- a/configure.ac 2017-03-31 09:15:57.593261737 -0500 ++++ b/configure.ac 2017-03-31 09:17:32.969716649 -0500 +@@ -55,9 +55,9 @@ + LIBS="" + AC_SEARCH_LIBS([readline],[edit],[ + AC_DEFINE([HAVE_EDITLINE],1,Define to use BSD editline) +- READLINE_LIBS="$LIBS -ltinfo" ++ READLINE_LIBS="$LIBS" + enable_readline=no +- ],[],[-ltinfo]) ++ ]) + AS_UNSET(ac_cv_search_readline) + LIBS=$sLIBS + ]) Modified: branches/1.0/package/sqlite/sqlite.mk =================================================================== --- branches/1.0/package/sqlite/sqlite.mk 2017-03-31 13:22:31 UTC (rev 8250) +++ branches/1.0/package/sqlite/sqlite.mk 2017-03-31 14:49:58 UTC (rev 8251) @@ -4,11 +4,14 @@ # ############################################################# -SQLITE_VERSION = 3170000 +SQLITE_VERSION = 3180000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2017 SQLITE_INSTALL_STAGING = YES +# sqlite-0001-editline-configure-fix.patch +SQLITE_AUTORECONF = YES + SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |