summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pseudo
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-11-06 12:24:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-14 11:14:39 +0000
commite39fec613d52324a4ae415a0c544612a8da4af3b (patch)
tree07fe6b780afa79865e96ba48bde838306a18b1c7 /meta/recipes-devtools/pseudo
parent254c577fae9a649195aaaba4d7a9edb0caaa4941 (diff)
downloadpoky-e39fec613d52324a4ae415a0c544612a8da4af3b.tar.gz
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. (From OE-Core rev: b24a67217d82f225e76fbc2dfb70dd8e1a6ea215) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo')
-rw-r--r--meta/recipes-devtools/pseudo/files/libm.patch33
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pseudo/files/libm.patch b/meta/recipes-devtools/pseudo/files/libm.patch
new file mode 100644
index 0000000000..1a82979313
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/files/libm.patch
@@ -0,0 +1,33 @@
1If sqlite3 is built with FTS5 enabled then it links to libm.so for log(), but if
2we statically link to libsqlite3.a then this linkage is lost.
3
4Work around this by always linking to libm.so.
5
6Upstream-Status: Submitted
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9From 4633a8750f0966621d258548fba82bc6aa5aa997 Mon Sep 17 00:00:00 2001
10From: Ross Burton <ross.burton@intel.com>
11Date: Tue, 6 Nov 2018 12:13:17 +0000
12Subject: [PATCH] Makefile: sqlite can need libm
13
14---
15 Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index ad6541b..28b5ecb 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -73,7 +73,7 @@ WRAPOBJS=pseudo_wrappers.o
23
24 # needed for anything that links with pseduo_client.o, pretty much
25 CLIENT_LDFLAGS=-ldl -lpthread
26-DB_LDFLAGS=@SQLITE_LDARG@ -lpthread
27+DB_LDFLAGS=@SQLITE_LDARG@ -lpthread -lm
28
29 PSEUDO=$(BIN)/pseudo
30 PSEUDODB=$(BIN)/pseudodb
31--
322.11.0
33
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 79e0b6bd21..c9a4ecd2e2 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -2,6 +2,7 @@ require pseudo.inc
2 2
3SRC_URI = "git://git.yoctoproject.org/pseudo \ 3SRC_URI = "git://git.yoctoproject.org/pseudo \
4 file://0001-configure-Prune-PIE-flags.patch \ 4 file://0001-configure-Prune-PIE-flags.patch \
5 file://libm.patch \
5 file://fallback-passwd \ 6 file://fallback-passwd \
6 file://fallback-group \ 7 file://fallback-group \
7 file://moreretries.patch \ 8 file://moreretries.patch \