From baa81362ef38ca3c7d1f012029c1b95b9abb5649 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Jul 2025 08:18:25 +0200 Subject: [PATCH] package/readline: Use configure options to link with ncurses Use configure options to link with ncurses available since version 8.2: https://cgit.git.savannah.gnu.org/cgit/readline.git/tree/NEWS?h=readline-8.3#n100 Removed a 14 year-old patch added with buildroot commit b864790383b1cb8d51e5202bb750c0a6601b21ab. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - package/readline/0001-curses-link.patch | 18 ------------------ package/readline/readline.mk | 5 ++++- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 package/readline/0001-curses-link.patch diff --git a/.checkpackageignore b/.checkpackageignore index f5b158c450..298d080475 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1014,7 +1014,6 @@ package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch package/read-edid/0001-Fix-install-file-list.patch lib_patch.Upstream package/read-edid/0002-Fix-compiler-check.patch lib_patch.Upstream package/read-edid/0003-fix-build-with-gcc-10.patch lib_patch.Upstream -package/readline/0001-curses-link.patch lib_patch.Upstream package/redis/0001-uclibc.patch lib_patch.Upstream package/redis/0002-largefile-conditional-define.patch lib_patch.Upstream package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch lib_patch.Upstream diff --git a/package/readline/0001-curses-link.patch b/package/readline/0001-curses-link.patch deleted file mode 100644 index 6afc5ba078..0000000000 --- a/package/readline/0001-curses-link.patch +++ /dev/null @@ -1,18 +0,0 @@ -link readline directly to ncurses since it needs symbols from it - -upstream readline does this on purpose (no direct linking), but -it doesn't make much sense in a Linux world - -Signed-off-by: Gustavo Zacarias - ---- a/support/shobj-conf -+++ b/support/shobj-conf -@@ -42,7 +42,7 @@ - SHOBJ_LIBS= - - SHLIB_XLDFLAGS= --SHLIB_LIBS= -+SHLIB_LIBS=-lncurses - - SHLIB_DOT='.' - SHLIB_LIBPREF='lib' diff --git a/package/readline/readline.mk b/package/readline/readline.mk index f46d6783f1..f69cbe45e2 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -11,7 +11,10 @@ READLINE_DEPENDENCIES = ncurses host-autoconf HOST_READLINE_DEPENDENCIES = host-ncurses host-autoconf READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ bash_cv_wcwidth_broken=no -READLINE_CONF_OPTS = --disable-install-examples +READLINE_CONF_OPTS = \ + --disable-install-examples \ + --with-curses \ + --with-shared-termcap-library READLINE_LICENSE = GPL-3.0+ READLINE_LICENSE_FILES = COPYING READLINE_CPE_ID_VENDOR = gnu