Revert "package/sqlite: fix configure options for readline/editline support"
This reverts commit 004db1f5f3.
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Scott Fan <fancp2007@gmail.com>
Cc: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
274c36578f
commit
f0a272ef14
@@ -44,12 +44,9 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy)
|
||||
SQLITE_DEPENDENCIES += ncurses readline
|
||||
SQLITE_CFLAGS += -DHAVE_READLINE=1
|
||||
SQLITE_LDFLAGS += -lreadline -lncurses
|
||||
else ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_LIBEDIT),yy)
|
||||
SQLITE_DEPENDENCIES += ncurses libedit
|
||||
SQLITE_CFLAGS += -DHAVE_EDITLINE=1
|
||||
SQLITE_LDFLAGS += -ledit -lncurses
|
||||
else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
|
||||
SQLITE_DEPENDENCIES += libedit
|
||||
SQLITE_CONF_OPTS += --disable-readline --editline
|
||||
else
|
||||
SQLITE_CONF_OPTS += --disable-readline
|
||||
endif
|
||||
@@ -62,7 +59,7 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),)
|
||||
SQLITE_CONF_OPTS += --disable-json
|
||||
endif
|
||||
|
||||
SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)" LDFLAGS="$(SQLITE_LDFLAGS)"
|
||||
SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)"
|
||||
|
||||
define SQLITE_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SQLITE_CONF_ENV) ./configure \
|
||||
|
||||
Reference in New Issue
Block a user