summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2010-07-20 16:26:40 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-21 16:01:00 +0100
commit929169be0f67b9171ede4455a6070c0961de9b50 (patch)
treea6e5f9c5296cdc9ced7f54ada77039cdac1fe509
parent12c929683f6211dcef7b16c90ab4c4984eae95c9 (diff)
downloadpoky-929169be0f67b9171ede4455a6070c0961de9b50.tar.gz
sqlite3: upgrade to 3.6.23.1
also remove the cross-compile.patch and ldflags.patch, since they are no longer used. Signed-off-by: Yu Ke <ke.yu@intel.com>
-rw-r--r--meta/packages/sqlite/sqlite3.inc3
-rw-r--r--meta/packages/sqlite/sqlite3/cross-compile.patch92
-rw-r--r--meta/packages/sqlite/sqlite3/ldflags.patch67
-rw-r--r--meta/packages/sqlite/sqlite3_3.6.23.1.bb (renamed from meta/packages/sqlite/sqlite3_3.6.20.bb)2
4 files changed, 3 insertions, 161 deletions
diff --git a/meta/packages/sqlite/sqlite3.inc b/meta/packages/sqlite/sqlite3.inc
index fc102c4b69..11e901114a 100644
--- a/meta/packages/sqlite/sqlite3.inc
+++ b/meta/packages/sqlite/sqlite3.inc
@@ -1,11 +1,12 @@
1DESCRIPTION = "An Embeddable SQL Database Engine" 1DESCRIPTION = "An Embeddable SQL Database Engine"
2HOMEPAGE = "http://www.sqlite.org"
2SECTION = "libs" 3SECTION = "libs"
3PRIORITY = "optional" 4PRIORITY = "optional"
4DEPENDS = "readline ncurses tcl-native" 5DEPENDS = "readline ncurses tcl-native"
5LICENSE = "PD" 6LICENSE = "PD"
6 7
7SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ 8SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
8 file://libtool.patch;patch=1" 9 file://libtool.patch"
9 10
10S = "${WORKDIR}/sqlite-${PV}" 11S = "${WORKDIR}/sqlite-${PV}"
11 12
diff --git a/meta/packages/sqlite/sqlite3/cross-compile.patch b/meta/packages/sqlite/sqlite3/cross-compile.patch
deleted file mode 100644
index 31d4f0d162..0000000000
--- a/meta/packages/sqlite/sqlite3/cross-compile.patch
+++ /dev/null
@@ -1,92 +0,0 @@
1--- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200
2+++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200
3@@ -187,10 +187,11 @@
4 default_build_cflags="-g"
5 if test "$config_BUILD_CC" = ""; then
6 AC_PROG_CC
7- if test "$cross_compiling" = "yes"; then
8- AC_MSG_ERROR([unable to find a compiler for building build tools])
9- fi
10- BUILD_CC=$CC
11+# if test "$cross_compiling" = "yes"; then
12+# AC_MSG_ERROR([unable to find a compiler for building build tools])
13+# fi
14+# BUILD_CC=$CC
15+BUILD_CC=gcc
16 default_build_cflags=$CFLAGS
17 else
18 BUILD_CC=$config_BUILD_CC
19@@ -238,6 +239,12 @@
20 TARGET_LINK=$config_TARGET_LINK
21 fi
22 AC_MSG_RESULT($TARGET_LINK)
23+if test "$config_TARGET_LFLAGS" != ""; then
24+ TARGET_LFLAGS=$config_TARGET_LFLAGS
25+ else
26+ TARGET_LFLAGS=$BUILD_LFLAGS
27+ fi
28+AC_MSG_RESULT($TARGET_LFLAGS)
29 AC_MSG_CHECKING([switches on the target compiler])
30 if test "$config_TARGET_TFLAGS" != ""; then
31 TARGET_TFLAGS=$config_TARGET_TFLAGS
32@@ -592,15 +599,7 @@
33 # Figure out what C libraries are required to compile programs
34 # that use "readline()" library.
35 #
36-if test "$config_TARGET_READLINE_LIBS" != ""; then
37- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
38-else
39- CC=$TARGET_CC
40- LIBS=""
41- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
42- AC_CHECK_LIB([readline], [readline])
43- TARGET_READLINE_LIBS="$LIBS"
44-fi
45+TARGET_READLINE_LIBS="-lreadline"
46 AC_SUBST(TARGET_READLINE_LIBS)
47
48 ##########
49@@ -615,41 +614,8 @@
50 ##########
51 # Figure out where to get the READLINE header files.
52 #
53-AC_MSG_CHECKING([readline header files])
54-found=no
55-if test "$config_TARGET_READLINE_INC" != ""; then
56- TARGET_READLINE_INC=$config_TARGET_READLINE_INC
57- found=yes
58-fi
59-if test "$found" = "yes"; then
60- AC_MSG_RESULT($TARGET_READLINE_INC)
61-else
62- AC_MSG_RESULT(not specified: still searching...)
63- AC_CHECK_HEADER(readline.h, [found=yes])
64-fi
65-if test "$found" = "no"; then
66- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
67- AC_CHECK_FILE($dir/include/readline.h, found=yes)
68- if test "$found" = "yes"; then
69- TARGET_READLINE_INC="-I$dir/include"
70- break
71- fi
72- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
73- if test "$found" = "yes"; then
74- TARGET_READLINE_INC="-I$dir/include/readline"
75- break
76- fi
77- done
78-fi
79-if test "$found" = "yes"; then
80- if test "$TARGET_READLINE_LIBS" = ""; then
81- TARGET_HAVE_READLINE=0
82- else
83- TARGET_HAVE_READLINE=1
84- fi
85-else
86- TARGET_HAVE_READLINE=0
87-fi
88+TARGET_READLINE_INC=""
89+TARGET_HAVE_READLINE=1
90 AC_SUBST(TARGET_READLINE_INC)
91 AC_SUBST(TARGET_HAVE_READLINE)
92
diff --git a/meta/packages/sqlite/sqlite3/ldflags.patch b/meta/packages/sqlite/sqlite3/ldflags.patch
deleted file mode 100644
index ee5105ffff..0000000000
--- a/meta/packages/sqlite/sqlite3/ldflags.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1--- sqlite-3.3.7/Makefile.in.orig 2006-08-20 23:05:36.000000000 +0200
2+++ sqlite-3.3.7/Makefile.in 2006-08-20 23:42:49.000000000 +0200
3@@ -31,6 +31,10 @@
4 #
5 TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
6
7+# OE overrides
8+#
9+TARGET_LFLAGS = @TARGET_LFLAGS@
10+
11 # Define -DNDEBUG to compile without debugging (i.e., for production usage)
12 # Omitting the define will cause extra debugging code to be inserted and
13 # includes extra comments when "EXPLAIN stmt" is used.
14@@ -257,17 +261,17 @@
15 | $(NAWK) '{print $$5,$$6}' >last_change
16
17 libsqlite3.la: $(LIBOBJ)
18- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
19+ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \
20 ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
21
22 libtclsqlite3.la: tclsqlite.lo libsqlite3.la
23 $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
24- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \
25+ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \
26 -rpath $(libdir)/sqlite \
27 -version-info "8:6:8"
28
29 sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
30- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
31+ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \
32 -o $@ $(TOP)/src/shell.c libsqlite3.la \
33 $(LIBREADLINE) $(TLIBS)
34
35@@ -456,12 +460,12 @@
36
37 tclsqlite3: tclsqlite-shell.lo libsqlite3.la
38 $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
39- libsqlite3.la $(LIBTCL)
40+ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
41
42 testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
43 $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
44 $(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
45- libsqlite3.la $(LIBTCL)
46+ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
47
48
49 fulltest: testfixture$(TEXE) sqlite3$(TEXE)
50@@ -471,7 +475,7 @@
51 ./testfixture $(TOP)/test/quick.test
52
53 sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \
54- $(TESTSRC) $(TOP)/tool/spaceanal.tcl
55+ $(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl
56 sed \
57 -e '/^#/d' \
58 -e 's,\\,\\\\,g' \
59@@ -481,7 +485,7 @@
60 $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
61 $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\
62 -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
63- libtclsqlite3.la $(LIBTCL)
64+ libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
65
66 # Rules used to build documentation
67 #
diff --git a/meta/packages/sqlite/sqlite3_3.6.20.bb b/meta/packages/sqlite/sqlite3_3.6.23.1.bb
index 399b6e2a5a..479516d261 100644
--- a/meta/packages/sqlite/sqlite3_3.6.20.bb
+++ b/meta/packages/sqlite/sqlite3_3.6.23.1.bb
@@ -1,3 +1,3 @@
1require sqlite3.inc 1require sqlite3.inc
2 2
3PR = "r2" 3PR = "r0"