mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 00:20:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "package/sqlite: fix configure options for readline/editline support"

Browse Source 
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:
Yann E. MORIN
2025-02-19 23:10:31 +01:00
committed by Julien Olivain
parent 274c36578f
commit f0a272ef14
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/sqlite/sqlite.mk
View File

@@ -44,12 +44,9 @@ endif
ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy)
SQLITE_DEPENDENCIES += ncurses readline SQLITE_DEPENDENCIES += ncurses readline
SQLITE_CFLAGS += -DHAVE_READLINE=1 else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
SQLITE_LDFLAGS += -lreadline -lncurses SQLITE_DEPENDENCIES += libedit
else ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_LIBEDIT),yy) SQLITE_CONF_OPTS += --disable-readline --editline
SQLITE_DEPENDENCIES += ncurses libedit
SQLITE_CFLAGS += -DHAVE_EDITLINE=1
SQLITE_LDFLAGS += -ledit -lncurses
else else
SQLITE_CONF_OPTS += --disable-readline SQLITE_CONF_OPTS += --disable-readline
endif endif
@@ -62,7 +59,7 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),)
SQLITE_CONF_OPTS += --disable-json SQLITE_CONF_OPTS += --disable-json
endif endif
SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)" LDFLAGS="$(SQLITE_LDFLAGS)" SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)"
define SQLITE_CONFIGURE_CMDS define SQLITE_CONFIGURE_CMDS
(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SQLITE_CONF_ENV) ./configure \ (cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SQLITE_CONF_ENV) ./configure \