summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2019-08-06 14:16:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-07 16:08:08 +0100
commit0af2c6af0d5c060666f7ee6f2ef428c1a414cb86 (patch)
treeca2021535633392fae44e373575aebdd6d8907c4 /meta/recipes-support
parentbeb4fb0b0e89ce6b80645322ee435a6b4909b652 (diff)
downloadopenembedded-core-0af2c6af0d5c060666f7ee6f2ef428c1a414cb86.tar.gz
openembedded-core-0af2c6af0d5c060666f7ee6f2ef428c1a414cb86.tar.bz2
openembedded-core-0af2c6af0d5c060666f7ee6f2ef428c1a414cb86.zip
sqlite3: Fix zlib determinism problem
sqlite3-native in particular was finding zlib from the host if zlib-devel was installed. This could lead to races where pseudo-native may or may not fail to build. We don't need/use compressed page support with sqlite so disable the dependency (it doesn't have a configure option so use a autoconf cache variable). The target binaries were not previously building with zlib, so we will leave the default being zlib turned off, while the host binaries were building with it "occasionally", but not for anything at runtime. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/sqlite/sqlite3.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index daf3db5e9f..7cf23d0447 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -34,6 +34,9 @@ PACKAGECONFIG[json1] = "--enable-json1,--disable-json1"
PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree"
PACKAGECONFIG[session] = "--enable-session,--disable-session"
PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions"
+PACKAGECONFIG[zlib] = ",,zlib"
+
+CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'zlib', '', 'ac_cv_search_deflate=no',d)}"
EXTRA_OECONF = " \
--enable-shared \