diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2016-02-08 20:56:41 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-02-23 23:56:02 +0100 |
| commit | 007c2ce917199339c0876227c2e612b11f8e7e15 (patch) | |
| tree | d4bccdddcfe55b4066fab7f1cce75f1f5e3dbcfa | |
| parent | 6c49ae49d9cf42d29b31505054b79ea414c33480 (diff) | |
| download | buildroot-007c2ce917199339c0876227c2e612b11f8e7e15.tar.gz buildroot-007c2ce917199339c0876227c2e612b11f8e7e15.zip | |
package/sqlite: add optional support for libedit
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | Config.in.legacy | 11 | ||||
| -rw-r--r-- | package/sqlite/Config.in | 7 | ||||
| -rw-r--r-- | package/sqlite/sqlite.mk | 9 |
3 files changed, 17 insertions, 10 deletions
diff --git a/Config.in.legacy b/Config.in.legacy index 3677f867d5..0ea8c7d8d1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,17 @@ endif ############################################################################### comment "Legacy options removed in 2016.02" +config BR2_PACKAGE_SQLITE_READLINE + bool "command-line editing support was updated" + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE + select BR2_LEGACY + help + This option was removed in favour of the sqlite package + deciding itself depending on the enabled packages whether + command-line editing should be enabled, it also also takes + libedit into account. + config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL bool "openpowerlink debug option has been removed" select BR2_LEGACY diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 7ea9eb15b8..c9fde53b36 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -8,13 +8,6 @@ config BR2_PACKAGE_SQLITE if BR2_PACKAGE_SQLITE -config BR2_PACKAGE_SQLITE_READLINE - bool "Command-line editing" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - help - Enable command-line editing. This requires ncurses and readline. - config BR2_PACKAGE_SQLITE_STAT3 bool "Additional query optimizations (stat3)" help diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 0a119cc30e..870b891c4f 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -45,11 +45,14 @@ else SQLITE_CONF_OPTS += --disable-threadsafe endif -ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y) +ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) SQLITE_DEPENDENCIES += ncurses readline -SQLITE_CONF_OPTS += --enable-readline +SQLITE_CONF_OPTS += --disable-editline --enable-readline +else ifeq ($(BR2_PACKAGE_LIBEDIT),y) +SQLITE_DEPENDENCIES += libedit +SQLITE_CONF_OPTS += --enable-editline --disable-readline else -SQLITE_CONF_OPTS += --disable-readline +SQLITE_CONF_OPTS += --disable-editline --disable-readline endif $(eval $(autotools-package)) |
