diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
| commit | 28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch) | |
| tree | fe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/sqlite/sqlite.mk | |
| parent | 13222c07293becaefc69c46c8f90b04ddc7023d9 (diff) | |
| parent | 2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff) | |
| download | buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.tar.gz buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/sqlite/sqlite.mk')
| -rw-r--r-- | package/sqlite/sqlite.mk | 11 |
1 files changed, 7 insertions, 4 deletions
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)) |
