diff options
| author |   Jens Rehsack <sno@netbsd.org> | 2018-11-18 19:36:46 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-20 10:11:24 +0000 |
| commit | 042af406583acc091ef82c3d1dcedd41315046de (patch) | |
| tree | 5a62053b50fea6c59f2a3580bc208dd6dede33ca /meta/recipes-devtools/pseudo/files | |
| parent | d533ad9b93383a8d721b72b4030b112a3799d559 (diff) | |
| download | openembedded-core-contrib-042af406583acc091ef82c3d1dcedd41315046de.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
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')
| -rw-r--r-- | meta/recipes-devtools/pseudo/files/libm.patch | 33 |
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 @@ -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@intel.com> - -From 4633a8750f0966621d258548fba82bc6aa5aa997 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@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 - |