소스 검색

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>
Bernd Kuhls 9 년 전
부모
커밋
007c2ce917
3개의 변경된 파일17개의 추가작업 그리고 10개의 파일을 삭제
  1. 11 0
      Config.in.legacy
  2. 0 7
      package/sqlite/Config.in
  3. 6 3
      package/sqlite/sqlite.mk

+ 11 - 0
Config.in.legacy

@@ -145,6 +145,17 @@ endif
 ###############################################################################
 ###############################################################################
 comment "Legacy options removed in 2016.02"
 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
 config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL
 	bool "openpowerlink debug option has been removed"
 	bool "openpowerlink debug option has been removed"
 	select BR2_LEGACY
 	select BR2_LEGACY

+ 0 - 7
package/sqlite/Config.in

@@ -8,13 +8,6 @@ config BR2_PACKAGE_SQLITE
 
 
 if 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
 config BR2_PACKAGE_SQLITE_STAT3
 	bool "Additional query optimizations (stat3)"
 	bool "Additional query optimizations (stat3)"
 	help
 	help

+ 6 - 3
package/sqlite/sqlite.mk

@@ -45,11 +45,14 @@ else
 SQLITE_CONF_OPTS += --disable-threadsafe
 SQLITE_CONF_OPTS += --disable-threadsafe
 endif
 endif
 
 
-ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
+ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy)
 SQLITE_DEPENDENCIES += ncurses readline
 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
 else
-SQLITE_CONF_OPTS += --disable-readline
+SQLITE_CONF_OPTS += --disable-editline --disable-readline
 endif
 endif
 
 
 $(eval $(autotools-package))
 $(eval $(autotools-package))