[Astlinux-commits] SF.net SVN: astlinux:[7326] branches/1.0/package/sqlite

[<abe...@us...>]

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.