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:32:16 +0000 |
commit | 1d8a8e36b99827e01aaa834f39be6db17a05a4bf (patch) | |
tree | 571a99953ad4e82ca955fbac0cd30e627f9ac2b1 /meta/recipes-devtools/pseudo/pseudo.inc | |
parent | e234be1befd8dc205fff093a46de9177018b209e (diff) | |
download | poky-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/pseudo.inc')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index cdc2a5823f..8b05735bb1 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
@@ -17,7 +17,7 @@ PROVIDES += "virtual/fakeroot" | |||
17 | 17 | ||
18 | MAKEOPTS = "" | 18 | MAKEOPTS = "" |
19 | 19 | ||
20 | inherit siteinfo | 20 | inherit siteinfo pkgconfig |
21 | 21 | ||
22 | do_configure () { | 22 | do_configure () { |
23 | : | 23 | : |
@@ -30,10 +30,23 @@ PSEUDO_EXTRA_OPTS ?= "--enable-force-async --without-passwd-fallback --enable-ep | |||
30 | 30 | ||
31 | # Compile for the local machine arch... | 31 | # Compile for the local machine arch... |
32 | do_compile () { | 32 | do_compile () { |
33 | SQLITE_LDADD='$(SQLITE)/$(SQLITE_LIB)/libsqlite3.a' | ||
34 | for sqlite_link_opt in $(pkg-config sqlite3 --libs --static) | ||
35 | do | ||
36 | case "$sqlite_link_opt" in | ||
37 | -lsqlite3) | ||
38 | ;; | ||
39 | -l*) | ||
40 | SQLITE_LDADD="${SQLITE_LDADD} ${sqlite_link_opt}" | ||
41 | ;; | ||
42 | *) | ||
43 | ;; | ||
44 | esac | ||
45 | done | ||
33 | if [ "${SITEINFO_BITS}" = "64" ]; then | 46 | if [ "${SITEINFO_BITS}" = "64" ]; then |
34 | ${S}/configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath | 47 | ${S}/configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --with-static-sqlite="$SQLITE_LDADD" --without-rpath |
35 | else | 48 | else |
36 | ${S}/configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath | 49 | ${S}/configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --with-static-sqlite="$SQLITE_LDADD" --without-rpath |
37 | fi | 50 | fi |
38 | oe_runmake ${MAKEOPTS} | 51 | oe_runmake ${MAKEOPTS} |
39 | } | 52 | } |