summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-16 18:49:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:39:30 +0000
commit012460d4ff714ee75f977c35af7749c5544da7b1 (patch)
treefab9dde4e91cf10f82eeffc95f0928c8f395b03e /meta/recipes-support
parentf770a6e0c2e1d687abab6f2bf79091b1068d1ccb (diff)
downloadpoky-012460d4ff714ee75f977c35af7749c5544da7b1.tar.gz
sqlite3: update 3.10.2 -> 3.11.0
http://www.sqlite.org/releaselog/3_11_0.html (From OE-Core rev: f92465c02ea6aef59f5e65a9eb70ebc6a5c92617) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/sqlite/sqlite3/fix-disable-static-shell.patch61
-rw-r--r--meta/recipes-support/sqlite/sqlite3/parallel.patch32
-rw-r--r--meta/recipes-support/sqlite/sqlite3_3.11.0.bb (renamed from meta/recipes-support/sqlite/sqlite3_3.10.2.bb)6
3 files changed, 64 insertions, 35 deletions
diff --git a/meta/recipes-support/sqlite/sqlite3/fix-disable-static-shell.patch b/meta/recipes-support/sqlite/sqlite3/fix-disable-static-shell.patch
new file mode 100644
index 0000000000..6f39ae2663
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3/fix-disable-static-shell.patch
@@ -0,0 +1,61 @@
1From ede5db83e38cc8ad8c9be291cd8985f7ad99f291 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 16 Feb 2016 14:00:00 -0800
4Subject: [PATCH] fix --disable-static-shell
5
6Upstream sqlite seems to be moving further and further away from
7allowing the sqlite3 command line tool to be dynamically linked with
8sqlite.
9
10The --disable-static-shell configure option added in 3.10.0 no longer
11has any effect in 3.11.0. For now patch things up and make it work.
12
13Upstream-Status: Pending
14
15Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
16---
17 Makefile.am | 13 +++++++++++--
18 configure.ac | 2 +-
19 2 files changed, 12 insertions(+), 3 deletions(-)
20
21diff --git a/Makefile.am b/Makefile.am
22index 0e09cfc..608c0fd 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -6,9 +6,18 @@ libsqlite3_la_SOURCES = sqlite3.c
26 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
27
28 bin_PROGRAMS = sqlite3
29-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
30-sqlite3_LDADD = @READLINE_LIBS@
31+sqlite3_SOURCES = shell.c sqlite3.h
32+EXTRA_sqlite3_SOURCES = sqlite3.c
33+sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
34 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
35+
36+# Warning: Adding SQLITE_ENABLE_EXPLAIN_COMMENTS to sqlite3_CFLAGS doesn't
37+# actually have any effect if we link the sqlite3 command line tool with the
38+# libsqlite3.so shared library (which will contain a version of sqlite3.c
39+# compiled with the default AM_CFLAGS above). If SQLITE_ENABLE_EXPLAIN_COMMENTS
40+# debug is required, then sqlite3 must not be configured with
41+# --disable-static-shell
42+
43 sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
44
45 include_HEADERS = sqlite3.h sqlite3ext.h
46diff --git a/configure.ac b/configure.ac
47index 8e7fd69..ada559e 100644
48--- a/configure.ac
49+++ b/configure.ac
50@@ -130,7 +130,7 @@ AC_ARG_ENABLE(static-shell, [AS_HELP_STRING(
51 [statically link libsqlite3 into shell tool [default=yes]])],
52 [], [enable_static_shell=yes])
53 if test x"$enable_static_shell" == "xyes"; then
54- EXTRA_SHELL_OBJ=sqlite3.$OBJEXT
55+ EXTRA_SHELL_OBJ=sqlite3-sqlite3.$OBJEXT
56 else
57 EXTRA_SHELL_OBJ=libsqlite3.la
58 fi
59--
601.9.1
61
diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch
deleted file mode 100644
index 7b886a6bca..0000000000
--- a/meta/recipes-support/sqlite/sqlite3/parallel.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 140476c3e6a6f497bdd95c0c039cb9a680f5a414 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Fri, 22 Jan 2016 15:53:04 -0800
4Subject: [PATCH] parallel build fix
5
6When statically linking the sqlite3 binary, ensure that it depends on
7its own version of sqlite3.o, instead of the version being built (in
8parallel) for use in the libsqlite3.a static library.
9
10Upstream-Status: Pending
11
12Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
13---
14 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index e9b3950..0e8f043 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -129,7 +129,7 @@ AC_ARG_ENABLE(static-shell, [AS_HELP_STRING(
22 [statically link libsqlite3 into shell tool [default=yes]])],
23 [], [enable_static_shell=yes])
24 if test x"$enable_static_shell" == "xyes"; then
25- EXTRA_SHELL_OBJ=sqlite3.$OBJEXT
26+ EXTRA_SHELL_OBJ=sqlite3-sqlite3.$OBJEXT
27 else
28 EXTRA_SHELL_OBJ=libsqlite3.la
29 fi
30--
311.9.1
32
diff --git a/meta/recipes-support/sqlite/sqlite3_3.10.2.bb b/meta/recipes-support/sqlite/sqlite3_3.11.0.bb
index 75fabc67a2..992d20cd5b 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.10.2.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.11.0.bb
@@ -4,8 +4,8 @@ LICENSE = "PD"
4LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" 4LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
5 5
6SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \ 6SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \
7 file://parallel.patch \ 7 file://fix-disable-static-shell.patch \
8" 8"
9 9
10SRC_URI[md5sum] = "adaa31593bb5605ec6d6f34f81b43008" 10SRC_URI[md5sum] = "a6cdc3e0a6e5087d620037ae0c48720d"
11SRC_URI[sha256sum] = "a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971" 11SRC_URI[sha256sum] = "508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb"