summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pseudo/files/libm.patch
diff options
context:
space:
mode:
authorJens Rehsack <sno@netbsd.org>2018-11-18 19:36:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-20 10:32:16 +0000
commit1d8a8e36b99827e01aaa834f39be6db17a05a4bf (patch)
tree571a99953ad4e82ca955fbac0cd30e627f9ac2b1 /meta/recipes-devtools/pseudo/files/libm.patch
parente234be1befd8dc205fff093a46de9177018b209e (diff)
downloadpoky-1d8a8e36b99827e01aaa834f39be6db17a05a4bf.tar.gz
pseudo: fix link of sqlite3 using pkg-config
If sqlite3 is built with FTS5 it uses log() from libm, it sqlite3 is built with READLINE it uses tgetent from a curses lib and readline from libreadline, if it is built using deflate from libz ... , but all that linkage is lost if we manually statically link so explicitely extract extra static linking options from pkg-config and force them into pseudo as well. This commit obsoletes (so include the implicit revert) e39fec613d pseudo: fix link with new sqlite3 (From OE-Core rev: 042af406583acc091ef82c3d1dcedd41315046de) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/files/libm.patch')
-rw-r--r--meta/recipes-devtools/pseudo/files/libm.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-devtools/pseudo/files/libm.patch b/meta/recipes-devtools/pseudo/files/libm.patch
deleted file mode 100644
index 1a82979313..0000000000
--- a/meta/recipes-devtools/pseudo/files/libm.patch
+++ /dev/null
@@ -1,33 +0,0 @@
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