[oe-commits] [openembedded-core] 01/05: sqlite3: Fix zlib determinism problem

git at git.openembedded.org git at git.openembedded.org
Tue Aug 6 21:41:40 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit e14ca04eafe3ca3cec84d6bc97b28f709cceb193
Author: Jason Wessel <jason.wessel at windriver.com>
AuthorDate: Tue Aug 6 14:16:08 2019 -0700

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-support/sqlite/sqlite3.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index daf3db5..7cf23d0 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 \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list