Commit 007c2ce9 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

package/sqlite: add optional support for libedit 



Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6c49ae49

Config.in.legacy

+11 −0
Original line number Diff line number Diff line
@@ -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

package/sqlite/Config.in

+0 −7
Original line number Diff line number Diff line
@@ -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

package/sqlite/sqlite.mk

+6 −3
Original line number Diff line number Diff line
@@ -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))