]> code.ossystems Code Review - openembedded-core.git/commitdiff
sqlite3.inc: fix readline PACKAGECONFIG
authorAndre McCurdy <armccurdy@gmail.com>
Sat, 23 Jan 2016 01:26:00 +0000 (17:26 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 24 Jan 2016 10:55:44 +0000 (10:55 +0000)
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>
meta/recipes-support/sqlite/sqlite3.inc

index 5eb5de3b01188bbde17cab62d8e64ace90d51197..7245285594698ec17028070eb5da71e0be4c08ae 100644 (file)
@@ -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}"