From 72ac904ede4414e7d96da95c31785511a1f73172 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Fri, 17 Apr 2009 15:34:03 +0200
Subject: [PATCH] update to sqlite-3.6.13

---
 packages/databases/sqlite/build               | 14 +--
 packages/databases/sqlite/install             |  2 +-
 .../sqlite/patches/10_cross_compile.diff      | 92 -------------------
 .../databases/sqlite/patches/20_libtool.diff  | 13 ++-
 .../databases/sqlite/patches/30_ldflags.diff  | 78 ++++++++--------
 .../patches/40_cross_check_readline.diff      | 21 -----
 packages/databases/sqlite/url                 |  2 +-
 7 files changed, 49 insertions(+), 173 deletions(-)
 delete mode 100644 packages/databases/sqlite/patches/10_cross_compile.diff
 delete mode 100644 packages/databases/sqlite/patches/40_cross_check_readline.diff

diff --git a/packages/databases/sqlite/build b/packages/databases/sqlite/build
index 05cd0f7691..54cdae74fe 100755
--- a/packages/databases/sqlite/build
+++ b/packages/databases/sqlite/build
@@ -3,8 +3,6 @@
 . config/options
 
 $SCRIPTS/build toolchain
-$SCRIPTS/build readline
-$SCRIPTS/build ncurses
 
 export config_BUILD_CC="$HOST_CC"
 export config_BUILD_CFLAGS="$HOST_CFLAGS"
@@ -12,13 +10,9 @@ export config_BUILD_LIBS="$HOST_LDFLAGS"
 export config_TARGET_CC="$CC"
 export config_TARGET_LINK="$LD"
 export config_TARGET_CFLAGS="$CFLAGS"
-export config_TARGET_LFLAGS="$LDFLAGS"
-export config_TARGET_LIBS="-lncurses"
-export config_TARGET_READLINE_LIBS="-L$SYSROOT_PREFIX/usr/lib"
-export config_TARGET_READLINE_INC="-I$SYSROOT_PREFIX/usr/include/readline -lreadline"
+export config_TARGET_LFLAGS="$LDFLAGS -ldl"
 
 cd $BUILD/$1*
-
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -26,11 +20,13 @@ cd $BUILD/$1*
             --disable-static \
             --enable-shared \
             --disable-tcl \
-            --enable-threadsafe
+            --disable-readline \
+            --enable-threadsafe \
+            --enable-load-extension \
 
 make
 
 $STRIP .libs/*.so*
 $STRIP .libs/sqlite3
 
-$MAKEINSTALL
+$MAKEINSTALL
\ No newline at end of file
diff --git a/packages/databases/sqlite/install b/packages/databases/sqlite/install
index 1916c4f9f8..baa5294397 100755
--- a/packages/databases/sqlite/install
+++ b/packages/databases/sqlite/install
@@ -3,5 +3,5 @@
 . config/options
 
 mkdir -p $INSTALL/usr/lib
-cp -PR $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib
+cp -P $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib
 cp $BUILD/$1*/.libs/sqlite3 $INSTALL/usr/bin
diff --git a/packages/databases/sqlite/patches/10_cross_compile.diff b/packages/databases/sqlite/patches/10_cross_compile.diff
deleted file mode 100644
index 31d4f0d162..0000000000
--- a/packages/databases/sqlite/patches/10_cross_compile.diff
+++ /dev/null
@@ -1,92 +0,0 @@
---- sqlite-3.3.7/configure.ac.orig	2006-08-21 00:20:50.000000000 +0200
-+++ sqlite-3.3.7/configure.ac	2006-08-21 00:22:35.000000000 +0200
-@@ -187,10 +187,11 @@
- default_build_cflags="-g"
- if test "$config_BUILD_CC" = ""; then
-   AC_PROG_CC
--  if test "$cross_compiling" = "yes"; then
--    AC_MSG_ERROR([unable to find a compiler for building build tools])
--  fi
--  BUILD_CC=$CC
-+#  if test "$cross_compiling" = "yes"; then
-+#    AC_MSG_ERROR([unable to find a compiler for building build tools])
-+#  fi
-+#  BUILD_CC=$CC
-+BUILD_CC=gcc
-   default_build_cflags=$CFLAGS
- else
-   BUILD_CC=$config_BUILD_CC
-@@ -238,6 +239,12 @@
-   TARGET_LINK=$config_TARGET_LINK
- fi
- AC_MSG_RESULT($TARGET_LINK)
-+if test "$config_TARGET_LFLAGS" != ""; then
-+  TARGET_LFLAGS=$config_TARGET_LFLAGS
-+  else
-+    TARGET_LFLAGS=$BUILD_LFLAGS
-+  fi
-+AC_MSG_RESULT($TARGET_LFLAGS)
- AC_MSG_CHECKING([switches on the target compiler])
- if test "$config_TARGET_TFLAGS" != ""; then
-   TARGET_TFLAGS=$config_TARGET_TFLAGS
-@@ -592,15 +599,7 @@
- # Figure out what C libraries are required to compile programs
- # that use "readline()" library.
- #
--if test "$config_TARGET_READLINE_LIBS" != ""; then
--  TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
--else
--  CC=$TARGET_CC
--  LIBS=""
--  AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
--  AC_CHECK_LIB([readline], [readline])
--  TARGET_READLINE_LIBS="$LIBS"
--fi
-+TARGET_READLINE_LIBS="-lreadline"
- AC_SUBST(TARGET_READLINE_LIBS)
- 
- ##########
-@@ -615,41 +614,8 @@
- ##########
- # Figure out where to get the READLINE header files.
- #
--AC_MSG_CHECKING([readline header files])
--found=no
--if test "$config_TARGET_READLINE_INC" != ""; then
--  TARGET_READLINE_INC=$config_TARGET_READLINE_INC
--  found=yes
--fi
--if test "$found" = "yes"; then
--  AC_MSG_RESULT($TARGET_READLINE_INC)
--else
--  AC_MSG_RESULT(not specified: still searching...)
--  AC_CHECK_HEADER(readline.h, [found=yes])
--fi
--if test "$found" = "no"; then
--  for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
--    AC_CHECK_FILE($dir/include/readline.h, found=yes)
--    if test "$found" = "yes"; then
--      TARGET_READLINE_INC="-I$dir/include"
--      break
--    fi
--    AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
--    if test "$found" = "yes"; then
--      TARGET_READLINE_INC="-I$dir/include/readline"
--      break
--    fi
--  done
--fi
--if test "$found" = "yes"; then
--  if test "$TARGET_READLINE_LIBS" = ""; then
--    TARGET_HAVE_READLINE=0
--  else
--    TARGET_HAVE_READLINE=1
--  fi
--else
--  TARGET_HAVE_READLINE=0
--fi
-+TARGET_READLINE_INC=""
-+TARGET_HAVE_READLINE=1
- AC_SUBST(TARGET_READLINE_INC)
- AC_SUBST(TARGET_HAVE_READLINE)
- 
diff --git a/packages/databases/sqlite/patches/20_libtool.diff b/packages/databases/sqlite/patches/20_libtool.diff
index ccf9993ed2..0e442ae0a6 100644
--- a/packages/databases/sqlite/patches/20_libtool.diff
+++ b/packages/databases/sqlite/patches/20_libtool.diff
@@ -1,7 +1,6 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
+diff -Naur sqlite-3.6.11.orig/Makefile.in sqlite-3.6.11/Makefile.in
+--- sqlite-3.6.11.orig/Makefile.in	2009-03-15 14:58:48.000000000 +0100
++++ sqlite-3.6.11/Makefile.in	2009-03-15 15:01:15.000000000 +0100
 @@ -15,7 +15,10 @@
  # The toplevel directory of the source tree.  This is the directory
  # that contains this "Makefile.in" and the "configure.in" script.
@@ -14,9 +13,9 @@ Index: sqlite-3.2.1/Makefile.in
  
  # C Compiler and options for use in building executables that
  # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
+@@ -147,7 +150,7 @@
+ bindir = @bindir@
+ includedir = @includedir@
  INSTALL = @INSTALL@
 -LIBTOOL = ./libtool
 +LIBTOOL = @LIBTOOL@
diff --git a/packages/databases/sqlite/patches/30_ldflags.diff b/packages/databases/sqlite/patches/30_ldflags.diff
index ee5105ffff..38f16579f7 100644
--- a/packages/databases/sqlite/patches/30_ldflags.diff
+++ b/packages/databases/sqlite/patches/30_ldflags.diff
@@ -1,67 +1,61 @@
---- sqlite-3.3.7/Makefile.in.orig	2006-08-20 23:05:36.000000000 +0200
-+++ sqlite-3.3.7/Makefile.in	2006-08-20 23:42:49.000000000 +0200
-@@ -31,6 +31,10 @@
- #
- TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
+diff -Naur sqlite-3.6.13.orig/Makefile.in sqlite-3.6.13/Makefile.in
+--- sqlite-3.6.13.orig/Makefile.in.orig	2009-04-17 09:11:59.000000000 +0200
++++ sqlite-3.6.13/Makefile.in	2009-04-17 09:11:59.000000000 +0200
+@@ -36,6 +36,10 @@
+ # 
+ TCC += -D_HAVE_SQLITE_CONFIG_H
  
 +# OE overrides
 +#
-+TARGET_LFLAGS = @TARGET_LFLAGS@
++TARGET_LFLAGS = $(config_TARGET_LFLAGS)
 +
  # Define -DNDEBUG to compile without debugging (i.e., for production usage)
  # Omitting the define will cause extra debugging code to be inserted and
  # includes extra comments when "EXPLAIN stmt" is used.
-@@ -257,17 +261,17 @@
+@@ -465,18 +469,18 @@
            | $(NAWK) '{print $$5,$$6}' >last_change
  
  libsqlite3.la:	$(LIBOBJ)
--	$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
-+	$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \
- 		${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
+-	$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
++	$(LTLINK) -o $@ $(LIBOBJ) $(TARGET_LFLAGS) $(TLIBS) \
+ 		${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
  
  libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
- 	$(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
--		$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \
-+		$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \
-                 -rpath $(libdir)/sqlite \
- 		-version-info "8:6:8"
+ 	$(LTLINK) -o $@ tclsqlite.lo \
+-		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
++		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(TLIBS) \
+ 		-rpath "$(TCLLIBDIR)" \
+ 		-version-info "8:6:8" \
+ 		-avoid-version
  
  sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
--	$(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
-+	$(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \
+-	$(LTLINK) $(READLINE_FLAGS) \
++	$(LTLINK) $(READLINE_FLAGS) $(TARGET_LFLAGS) \
  		-o $@ $(TOP)/src/shell.c libsqlite3.la \
- 		$(LIBREADLINE) $(TLIBS)
+ 		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
  
-@@ -456,12 +460,12 @@
+@@ -747,13 +751,13 @@
  
- tclsqlite3:	tclsqlite-shell.lo libsqlite3.la
- 	$(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
+ tclsqlite3$(TEXE):	tclsqlite-shell.lo libsqlite3.la
+ 	$(LTLINK) -o $@ tclsqlite-shell.lo \
 -		 libsqlite3.la $(LIBTCL)
 +		 libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
  
- testfixture$(TEXE):	$(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
- 	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
- 		$(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
--		libsqlite3.la $(LIBTCL)
-+		libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ testfixture$(TEXE):	$(TESTFIXTURE_SRC)
+ 	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_NO_SYNC=1\
+ 		-DSQLITE_CRASH_TEST=1 \
+                 -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE $(TEMP_STORE) \
+-		-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
++		-o $@ $(TESTFIXTURE_SRC) $(TARGET_LFLAGS) $(LIBTCL) $(TLIBS)
  
  
  fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
-@@ -471,7 +475,7 @@
- 	./testfixture $(TOP)/test/quick.test
- 
- sqlite3_analyzer$(TEXE):	$(TOP)/src/tclsqlite.c libtclsqlite3.la \
--				$(TESTSRC) $(TOP)/tool/spaceanal.tcl
-+				$(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl
- 	sed \
- 	  -e '/^#/d' \
- 	  -e 's,\\,\\\\,g' \
-@@ -481,7 +485,7 @@
+@@ -772,7 +776,7 @@
  	  $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
- 	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\
-                 -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
--		libtclsqlite3.la $(LIBTCL)
-+		libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ 	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
+ 		-DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \
+-		$(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL)
++		$(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(TARGET_LFLAGS) $(LIBTCL)
  
- # Rules used to build documentation
- #
+ 
+ lib_install:	libsqlite3.la
diff --git a/packages/databases/sqlite/patches/40_cross_check_readline.diff b/packages/databases/sqlite/patches/40_cross_check_readline.diff
deleted file mode 100644
index a9fc02c259..0000000000
--- a/packages/databases/sqlite/patches/40_cross_check_readline.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur sqlite-3.3.7.orig/configure sqlite-3.3.7/configure
---- sqlite-3.3.7.orig/configure	2006-11-21 23:49:30.000000000 +0100
-+++ sqlite-3.3.7/configure	2006-11-21 23:49:38.000000000 +0100
-@@ -20414,7 +20414,7 @@
- if eval "test \"\${$as_ac_File+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  test "$cross_compiling" = yes &&
-+  test "$cross_compiling" = no &&
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -20440,7 +20440,7 @@
- if eval "test \"\${$as_ac_File+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  test "$cross_compiling" = yes &&
-+  test "$cross_compiling" = no &&
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
diff --git a/packages/databases/sqlite/url b/packages/databases/sqlite/url
index 4dcb0e0b08..930273cd02 100644
--- a/packages/databases/sqlite/url
+++ b/packages/databases/sqlite/url
@@ -1 +1 @@
-http://www.hwaci.com/sw/sqlite/sqlite-3.3.7.tar.gz
+http://www.hwaci.com/sw/sqlite/sqlite-3.6.13.tar.gz