summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-08 14:36:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-10 14:06:10 +0000
commit84bd11c62e860031c1615ada76d7140b4717276a (patch)
treeeeee35ef3c8a036383fadcad68c8044616b0d3f5 /meta
parent77fdbd2a0915db7c64749d0452118cc163111f65 (diff)
downloadpoky-84bd11c62e860031c1615ada76d7140b4717276a.tar.gz
pseudo: Drop static linking to sqlite3
Back in 2010[1] we made pseudo statically link against sqlite3. Since then the world has changed, pseudo now has separate processes for the database in the server and the client and they have separate linking commands. Also, whilst there were concerns about needing specific versions of sqlite3, in the OE environment, this is always the case. [1] http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=ad0ac0ecd38fc77daf42485489fccc10a5e1e3e7 The static sqlite3-native is causing us problems, in particular: tmp/work/x86_64-linux/pseudo-native/1.9.0+gitAUTOINC+060058bb29-r0/recipe-sysroot-native/usr/lib/libsqlite3.a(sqlite3.o):(.data.rel+0xb0): undefined reference to `fcntl64' which occurs if sqlite3-native was built on a machine with glibc 2.28 or later and pseudo-native is being built on glibc before that. With dyanmical linking, libc is backwards compatible and works but with static linking it does not. There appears to be no easy way to avoid this other than adding a copy of sqlite3 into the pseudo recipe. Given the static linking doesn't seem to be required any longer due to the separate processes, drop that to fix those issues. (From OE-Core rev: a0c238d40a9cc1f87da0607fddaaef0c31d93720) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/no-static-libs.inc4
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc17
2 files changed, 2 insertions, 19 deletions
diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc
index 4141ecb765..a3a865cac4 100644
--- a/meta/conf/distro/include/no-static-libs.inc
+++ b/meta/conf/distro/include/no-static-libs.inc
@@ -15,10 +15,6 @@ DISABLE_STATIC_pn-nativesdk-libcap = ""
15DISABLE_STATIC_pn-libpcap = "" 15DISABLE_STATIC_pn-libpcap = ""
16# needed by gdb 16# needed by gdb
17DISABLE_STATIC_pn-readline = "" 17DISABLE_STATIC_pn-readline = ""
18# needed by pseudo
19DISABLE_STATIC_pn-sqlite3 = ""
20DISABLE_STATIC_pn-sqlite3-native = ""
21DISABLE_STATIC_pn-nativesdk-sqlite3 = ""
22# openjade/sgml-common have build issues without static libs 18# openjade/sgml-common have build issues without static libs
23DISABLE_STATIC_pn-sgml-common-native = "" 19DISABLE_STATIC_pn-sgml-common-native = ""
24DISABLE_STATIC_pn-openjade-native = "" 20DISABLE_STATIC_pn-openjade-native = ""
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 8b34909726..7ff8e449e9 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -30,23 +30,10 @@ 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...
32do_compile () { 32do_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
46 if [ "${SITEINFO_BITS}" = "64" ]; then 33 if [ "${SITEINFO_BITS}" = "64" ]; then
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 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} --without-rpath
48 else 35 else
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 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} --without-rpath
50 fi 37 fi
51 oe_runmake ${MAKEOPTS} 38 oe_runmake ${MAKEOPTS}
52} 39}