summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-10-16 14:28:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:32 +0000
commit351c69a022ea0b147a2415a25d9ae096bdab7c69 (patch)
tree14ffde167ed24b28d3ca8566a136324c102ccdc7
parentc0fe43cdbef0e6edc1fea777b389b95275bbcc02 (diff)
downloadpoky-351c69a022ea0b147a2415a25d9ae096bdab7c69.tar.gz
sqlite: 3.8.10.2 -> 3.9.0
Upgrade sqlite from 3.8.10.2 to 3.9.0. * update python function to get right SRC_URI * drop 0001-using-the-dynamic-library.patch which use dynamic library that it is done that way in new version (From OE-Core rev: a23ddbd2e197cfa1ebc829e0d83b8997dc24cec7) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch30
-rw-r--r--meta/recipes-support/sqlite/sqlite3_3.9.0.bb (renamed from meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb)10
2 files changed, 5 insertions, 35 deletions
diff --git a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
deleted file mode 100644
index e3bfd5f656..0000000000
--- a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1[PATCH] using the dynamic library
2
3Upstream-Status: Inappropriate [configuration]
4
5building statically-linked sqlite3 failed since sqlite3.o is generated in
6different dir, even if link successes, the size of sqlite3 is become larger,
7so use the dynamic link, ref: http://patchwork.openembedded.org/patch/93293/
8
9Signed-off-by: Roy Li <rongqing.li@windriver.com>
10---
11 Makefile.am | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index 88bc23d..fe50f20 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
19
20 bin_PROGRAMS = sqlite3
21 sqlite3_SOURCES = shell.c sqlite3.h
22-sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
23+sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la
24+
25
26 include_HEADERS = sqlite3.h sqlite3ext.h
27
28--
291.9.1
30
diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb b/meta/recipes-support/sqlite/sqlite3_3.9.0.bb
index c72ad50f60..50531ba9dd 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.9.0.bb
@@ -4,16 +4,16 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b357
4 4
5def sqlite_download_version(d): 5def sqlite_download_version(d):
6 pvsplit = d.getVar('PV', True).split('.') 6 pvsplit = d.getVar('PV', True).split('.')
7 if len(pvsplit) < 4:
8 pvsplit.append('0')
7 return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) 9 return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]])
8 10
9PE = "3" 11PE = "3"
10SQLITE_PV = "${@sqlite_download_version(d)}" 12SQLITE_PV = "${@sqlite_download_version(d)}"
11SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \ 13SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz"
12 file://0001-using-the-dynamic-library.patch \
13"
14 14
15SRC_URI[md5sum] = "a18bfc015cd49a1e7a961b7b77bc3b37" 15SRC_URI[md5sum] = "cd0f883b2ddfc29e8e1bbbbd8e85f555"
16SRC_URI[sha256sum] = "8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626" 16SRC_URI[sha256sum] = "a324143f4cc35cd7e9605a0a8dec9f9e4861d0be8305f3642e7d05008b77e60d"
17 17
18S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" 18S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
19 19