From f0a272ef14c72e8b3b5b646e588e5683f04539ac Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 19 Feb 2025 23:10:31 +0100 Subject: [PATCH] Revert "package/sqlite: fix configure options for readline/editline support" This reverts commit 004db1f5f3adaab7264b84e0896f9761cd9a2657. Signed-off-by: Yann E. MORIN Cc: Scott Fan Cc: Romain Naour Signed-off-by: Julien Olivain --- package/sqlite/sqlite.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 255ddc937b..5a8b033ce0 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -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 \