diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-01-22 17:25:59 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-25 12:44:12 +0000 |
| commit | 939de8d52082f0c1f93dfc3b81daeaf5fc45999b (patch) | |
| tree | 10dc7152beb7214798ca7fa86357c91cd07190eb | |
| parent | a304b820b87ad4ba90a3e121cf864c445fee710c (diff) | |
| download | poky-939de8d52082f0c1f93dfc3b81daeaf5fc45999b.tar.gz | |
sqlite3: fix the parallel build fix patch
The previous parallel.patch broke dynamically linking sqlite3 with
libsqlite3.so (ie using the --disable-static-shell configure option).
(From OE-Core rev: c6f91029a05f41cba31702b88316ea66a719e866)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/sqlite/sqlite3/parallel.patch | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch index 87471f0615..7b886a6bca 100644 --- a/meta/recipes-support/sqlite/sqlite3/parallel.patch +++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch | |||
| @@ -1,24 +1,32 @@ | |||
| 1 | build: Fix parallel build problems | 1 | From 140476c3e6a6f497bdd95c0c039cb9a680f5a414 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
| 3 | Date: Fri, 22 Jan 2016 15:53:04 -0800 | ||
| 4 | Subject: [PATCH] parallel build fix | ||
| 2 | 5 | ||
| 3 | Avoid parallel build errors related to sqlite3.o target. | 6 | When statically linking the sqlite3 binary, ensure that it depends on |
| 7 | its own version of sqlite3.o, instead of the version being built (in | ||
| 8 | parallel) for use in the libsqlite3.a static library. | ||
| 4 | 9 | ||
| 5 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
| 6 | 11 | ||
| 7 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 12 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 8 | --- | 13 | --- |
| 9 | diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am | 14 | configure.ac | 2 +- |
| 10 | --- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200 | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | +++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200 | 16 | |
| 12 | @@ -6,10 +6,8 @@ | 17 | diff --git a/configure.ac b/configure.ac |
| 13 | libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 | 18 | index e9b3950..0e8f043 100644 |
| 14 | 19 | --- a/configure.ac | |
| 15 | bin_PROGRAMS = sqlite3 | 20 | +++ b/configure.ac |
| 16 | -sqlite3_SOURCES = shell.c sqlite3.h | 21 | @@ -129,7 +129,7 @@ AC_ARG_ENABLE(static-shell, [AS_HELP_STRING( |
| 17 | -EXTRA_sqlite3_SOURCES = sqlite3.c | 22 | [statically link libsqlite3 into shell tool [default=yes]])], |
| 18 | -sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ | 23 | [], [enable_static_shell=yes]) |
| 19 | -sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ | 24 | if test x"$enable_static_shell" == "xyes"; then |
| 20 | +sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h | 25 | - EXTRA_SHELL_OBJ=sqlite3.$OBJEXT |
| 21 | +sqlite3_LDADD = @READLINE_LIBS@ | 26 | + EXTRA_SHELL_OBJ=sqlite3-sqlite3.$OBJEXT |
| 22 | sqlite3_CFLAGS = $(AM_CFLAGS) | 27 | else |
| 23 | 28 | EXTRA_SHELL_OBJ=libsqlite3.la | |
| 24 | include_HEADERS = sqlite3.h sqlite3ext.h | 29 | fi |
| 30 | -- | ||
| 31 | 1.9.1 | ||
| 32 | |||