From 6188419d27ee2c8a3ec3631fb575837203952b2c Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 22 Jan 2016 17:26:00 -0800 Subject: 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. (From OE-Core rev: 2d93f7d6a93e9a4f9f4683e378c939f59461d803) Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/recipes-support/sqlite/sqlite3.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'meta/recipes-support') 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}" -- cgit v1.2.3-54-g00ecf