diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2019-08-06 14:16:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-07 16:08:15 +0100 |
commit | 3338776f11e6ebf3fd947c592ca8202315619f69 (patch) | |
tree | 65b449e89bb96868eadb4b47de1647ec6edc5d26 /meta/recipes-support/sqlite | |
parent | 6070e77e1ed5c170d86c41b6ef9c9f8e22dfea8d (diff) | |
download | poky-3338776f11e6ebf3fd947c592ca8202315619f69.tar.gz |
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.
(From OE-Core rev: 0af2c6af0d5c060666f7ee6f2ef428c1a414cb86)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/sqlite')
-rw-r--r-- | meta/recipes-support/sqlite/sqlite3.inc | 3 |
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" | |||
34 | PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree" | 34 | PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree" |
35 | PACKAGECONFIG[session] = "--enable-session,--disable-session" | 35 | PACKAGECONFIG[session] = "--enable-session,--disable-session" |
36 | PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions" | 36 | PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions" |
37 | PACKAGECONFIG[zlib] = ",,zlib" | ||
38 | |||
39 | CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'zlib', '', 'ac_cv_search_deflate=no',d)}" | ||
37 | 40 | ||
38 | EXTRA_OECONF = " \ | 41 | EXTRA_OECONF = " \ |
39 | --enable-shared \ | 42 | --enable-shared \ |