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>
This commit is contained in:
parent
a304b820b8
commit
939de8d520
|
@ -1,24 +1,32 @@
|
|||
build: Fix parallel build problems
|
||||
From 140476c3e6a6f497bdd95c0c039cb9a680f5a414 Mon Sep 17 00:00:00 2001
|
||||
From: Andre McCurdy <armccurdy@gmail.com>
|
||||
Date: Fri, 22 Jan 2016 15:53:04 -0800
|
||||
Subject: [PATCH] parallel build fix
|
||||
|
||||
Avoid parallel build errors related to sqlite3.o target.
|
||||
When statically linking the sqlite3 binary, ensure that it depends on
|
||||
its own version of sqlite3.o, instead of the version being built (in
|
||||
parallel) for use in the libsqlite3.a static library.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
||||
---
|
||||
diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am
|
||||
--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200
|
||||
+++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200
|
||||
@@ -6,10 +6,8 @@
|
||||
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
|
||||
|
||||
bin_PROGRAMS = sqlite3
|
||||
-sqlite3_SOURCES = shell.c sqlite3.h
|
||||
-EXTRA_sqlite3_SOURCES = sqlite3.c
|
||||
-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
|
||||
-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
|
||||
+sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
|
||||
+sqlite3_LDADD = @READLINE_LIBS@
|
||||
sqlite3_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
include_HEADERS = sqlite3.h sqlite3ext.h
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e9b3950..0e8f043 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -129,7 +129,7 @@ AC_ARG_ENABLE(static-shell, [AS_HELP_STRING(
|
||||
[statically link libsqlite3 into shell tool [default=yes]])],
|
||||
[], [enable_static_shell=yes])
|
||||
if test x"$enable_static_shell" == "xyes"; then
|
||||
- EXTRA_SHELL_OBJ=sqlite3.$OBJEXT
|
||||
+ EXTRA_SHELL_OBJ=sqlite3-sqlite3.$OBJEXT
|
||||
else
|
||||
EXTRA_SHELL_OBJ=libsqlite3.la
|
||||
fi
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue