summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-22 17:26:00 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 10:55:44 +0000
commit2d93f7d6a93e9a4f9f4683e378c939f59461d803 (patch)
tree9e1c361cc815f6a68d41d73ecf1963c3d6e902c7 /meta
parentc6f91029a05f41cba31702b88316ea66a719e866 (diff)
downloadopenembedded-core-2d93f7d6a93e9a4f9f4683e378c939f59461d803.tar.gz
openembedded-core-2d93f7d6a93e9a4f9f4683e378c939f59461d803.tar.bz2
openembedded-core-2d93f7d6a93e9a4f9f4683e378c939f59461d803.zip
sqlite3.inc: fix readline PACKAGECONFIG
Make it clearer that readline support for the target build is now disabled by default. Since readline dependencies and configure options are now handled by PACKAGECONFIG, avoid duplicating readline in DEPENDS or duplicating --disable-readline in EXTRA_OECONF. Also add --disable-editline to EXTRA_OECONF to avoid a potential floating dependency, since the configure script checks for libedit before it checks for libreadline. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/sqlite/sqlite3.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 5eb5de3b01..7245285594 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -1,15 +1,16 @@
SUMMARY = "Embeddable SQL database engine"
HOMEPAGE = "http://www.sqlite.org"
SECTION = "libs"
-DEPENDS = "readline ncurses"
-DEPENDS_class-native = ""
LICENSE = "PD"
inherit autotools pkgconfig
-EXTRA_OECONF = "--enable-shared --enable-threadsafe"
-EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline"
-PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
+PACKAGECONFIG ?= ""
+PACKAGECONFIG_class-native = ""
+
+PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses"
+
+EXTRA_OECONF = "--enable-shared --enable-threadsafe --disable-editline"
export config_BUILD_CC = "${BUILD_CC}"
export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"