diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
| commit | 9722c6ee87766a45a337c094d1293de81cdcb106 (patch) | |
| tree | 08b57716ae3c02fef2bc870b634019e692fd70e6 /poky/meta/recipes-support/sqlite/sqlite3.inc | |
| parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
| parent | 5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff) | |
| download | openbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'poky/meta/recipes-support/sqlite/sqlite3.inc')
| -rw-r--r-- | poky/meta/recipes-support/sqlite/sqlite3.inc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/poky/meta/recipes-support/sqlite/sqlite3.inc b/poky/meta/recipes-support/sqlite/sqlite3.inc index daf3db5e9..4af1e09e8 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/poky/meta/recipes-support/sqlite/sqlite3.inc @@ -19,7 +19,7 @@ UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" CVE_PRODUCT = "sqlite" -inherit autotools pkgconfig +inherit autotools pkgconfig siteinfo # enable those which are enabled by default in configure PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext" @@ -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 \ @@ -44,10 +47,14 @@ EXTRA_OECONF = " \ CFLAGS_append = " -fPIC" # pread() is in POSIX.1-2001 so any reasonable system must surely support it -CFLAGS += "-DUSE_PREAD" +CFLAGS_append = " -DUSE_PREAD" # Provide column meta-data API -CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA" + +# Unless SQLITE_BYTEORDER is predefined, the code falls back to build time +# huristics, which are not always correct +CFLAGS_append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" |