summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
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}