]> code.ossystems Code Review - openembedded-core.git/commitdiff
sqlite3: Fix zlib determinism problem
authorJason Wessel <jason.wessel@windriver.com>
Tue, 6 Aug 2019 21:16:08 +0000 (14:16 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 7 Aug 2019 15:08:08 +0000 (16:08 +0100)
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>
meta/recipes-support/sqlite/sqlite3.inc

index daf3db5e9fbb8f42013ffadc5417dd9252ea4e55..7cf23d04470e24759de0651ccbcddf1359f80d61 100644 (file)
@@ -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 \