diff options
Diffstat (limited to 'package/sqlite')
| -rw-r--r-- | package/sqlite/Config.in | 7 | ||||
| -rw-r--r-- | package/sqlite/sqlite.hash | 4 | ||||
| -rw-r--r-- | package/sqlite/sqlite.mk | 11 |
3 files changed, 9 insertions, 13 deletions
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.hash b/package/sqlite/sqlite.hash index 1f07794096..7a218dc5b8 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 ea4156fc3f6a4a4a2752a5a3ac5c5b3fe7e1a24b sqlite-autoconf-3100200.tar.gz +sha1 e2d300e4b24af5ecd67a1396488893fa44864e36 sqlite-autoconf-3110000.tar.gz # Calculated based on the hash above -sha256 a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971 sqlite-autoconf-3100200.tar.gz +sha256 508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb sqlite-autoconf-3110000.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 1603e006e6..870b891c4f 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3100200 +SQLITE_VERSION = 3110000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_LICENSE = Public domain @@ -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)) |
