[oe-commits] [openembedded-core] 30/48: pseudo: fix link with new sqlite3

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 6e501b77e969aea02eec17374dd4256d79ade778
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Nov 6 12:24:29 2018 +0000

    pseudo: fix link with new sqlite3
    
    If sqlite3 is built with FTS5 it uses log() from libm, but that linkage is lost
    if we manually statically link so explicitly link to libm.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/pseudo/files/libm.patch | 33 +++++++++++++++++++++++++++
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  1 +
 2 files changed, 34 insertions(+)

diff --git a/meta/recipes-devtools/pseudo/files/libm.patch b/meta/recipes-devtools/pseudo/files/libm.patch
new file mode 100644
index 0000000..1a82979
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/files/libm.patch
@@ -0,0 +1,33 @@
+If sqlite3 is built with FTS5 enabled then it links to libm.so for log(), but if
+we statically link to libsqlite3.a then this linkage is lost.
+
+Work around this by always linking to libm.so.
+
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+From 4633a8750f0966621d258548fba82bc6aa5aa997 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton at intel.com>
+Date: Tue, 6 Nov 2018 12:13:17 +0000
+Subject: [PATCH] Makefile: sqlite can need libm
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ad6541b..28b5ecb 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -73,7 +73,7 @@ WRAPOBJS=pseudo_wrappers.o
+ 
+ # needed for anything that links with pseduo_client.o, pretty much
+ CLIENT_LDFLAGS=-ldl -lpthread
+-DB_LDFLAGS=@SQLITE_LDARG@ -lpthread
++DB_LDFLAGS=@SQLITE_LDARG@ -lpthread -lm
+ 
+ PSEUDO=$(BIN)/pseudo
+ PSEUDODB=$(BIN)/pseudodb
+-- 
+2.11.0
+
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 79e0b6b..c9a4ecd 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -2,6 +2,7 @@ require pseudo.inc
 
 SRC_URI = "git://git.yoctoproject.org/pseudo \
            file://0001-configure-Prune-PIE-flags.patch \
+           file://libm.patch \
            file://fallback-passwd \
            file://fallback-group \
            file://moreretries.patch \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.