summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-01-13 12:46:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:07 +0000
commitf9974f2a612b6b8929130a4e35dd554c0f1e068f (patch)
tree102c46454e2e060419fc3c01293effc84cad7e6d /meta/recipes-support
parentcd7910df1d8c0f8996fc1af0b372bfad23d58c34 (diff)
downloadpoky-f9974f2a612b6b8929130a4e35dd554c0f1e068f.tar.gz
sqlite3: upgrade to version 3.10.0
3.9.2 -> 3.10.0 1. Fixed a parallel build problem 2. Added a PACKAGECONFIG for readline (From OE-Core rev: ed46ac71846845ffc41efcd55a36e27883d9980a) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/sqlite/sqlite3.inc2
-rw-r--r--meta/recipes-support/sqlite/sqlite3/parallel.patch24
-rw-r--r--meta/recipes-support/sqlite/sqlite3_3.10.0.bb (renamed from meta/recipes-support/sqlite/sqlite3_3.9.2.bb)8
3 files changed, 31 insertions, 3 deletions
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 2e3791bfc3..5eb5de3b01 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -9,6 +9,8 @@ inherit autotools pkgconfig
9 9
10EXTRA_OECONF = "--enable-shared --enable-threadsafe" 10EXTRA_OECONF = "--enable-shared --enable-threadsafe"
11EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline" 11EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline"
12PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
13
12export config_BUILD_CC = "${BUILD_CC}" 14export config_BUILD_CC = "${BUILD_CC}"
13export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" 15export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
14export config_BUILD_LIBS = "${BUILD_LDFLAGS}" 16export config_BUILD_LIBS = "${BUILD_LDFLAGS}"
diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch
new file mode 100644
index 0000000000..87471f0615
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch
@@ -0,0 +1,24 @@
1build: Fix parallel build problems
2
3Avoid parallel build errors related to sqlite3.o target.
4
5Upstream-Status: Pending
6
7Signed-off-by: Maxin B. John <maxin.john@intel.com>
8---
9diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am
10--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200
11+++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200
12@@ -6,10 +6,8 @@
13 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
14
15 bin_PROGRAMS = sqlite3
16-sqlite3_SOURCES = shell.c sqlite3.h
17-EXTRA_sqlite3_SOURCES = sqlite3.c
18-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
19-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
20+sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
21+sqlite3_LDADD = @READLINE_LIBS@
22 sqlite3_CFLAGS = $(AM_CFLAGS)
23
24 include_HEADERS = sqlite3.h sqlite3ext.h
diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb
index 18b1a2b57d..092f78266f 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb
@@ -10,10 +10,12 @@ def sqlite_download_version(d):
10 10
11PE = "3" 11PE = "3"
12SQLITE_PV = "${@sqlite_download_version(d)}" 12SQLITE_PV = "${@sqlite_download_version(d)}"
13SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz" 13SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \
14 file://parallel.patch \
15 "
14 16
15SRC_URI[md5sum] = "bc4eb5b3fc5cfcb6e059794306cac1ca" 17SRC_URI[md5sum] = "274364e6ca5c1104d42912f11e61ed26"
16SRC_URI[sha256sum] = "064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b" 18SRC_URI[sha256sum] = "43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042"
17 19
18UPSTREAM_CHECK_URI = "http://www.sqlite.org/" 20UPSTREAM_CHECK_URI = "http://www.sqlite.org/"
19UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" 21UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html"