Просмотр исходного кода

libedit: fix ncurses detection

We have disabled non-widechar support in ncurses a while back,
but libedit does not search for libncursesw by default so patch
configure.ac to add searching for it.
Waldemar Brodkorb 1 неделя назад
Родитель
Сommit
ca20fd3f8a
2 измененных файлов с 22 добавлено и 0 удалено
  1. 2 0
      package/libedit/Makefile
  2. 20 0
      package/libedit/patches/patch-configure_ac

+ 2 - 0
package/libedit/Makefile

@@ -19,6 +19,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBEDIT,libedit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 libedit-install:
 	$(INSTALL_DIR) $(IDIR_LIBEDIT)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libedit*.so* \

+ 20 - 0
package/libedit/patches/patch-configure_ac

@@ -0,0 +1,20 @@
+--- libedit-20260512-3.1.orig/configure.ac	2026-05-12 21:22:28.000000000 +0200
++++ libedit-20260512-3.1/configure.ac	2026-09-07 04:26:37.725668011 +0200
+@@ -45,7 +45,8 @@ AC_PROG_LN_S
+ AC_PROG_AWK
+ EL_MANTYPE
+ 
+-AC_CHECK_LIB(ncurses, tgetent,,
++AC_CHECK_LIB(ncursesw, tgetent,,
++ [AC_CHECK_LIB(ncurses, tgetent,,
+   [AC_CHECK_LIB(curses, tgetent,,
+     [AC_CHECK_LIB(termcap, tgetent,,
+       [AC_CHECK_LIB(tinfo, tgetent,,
+@@ -53,6 +54,7 @@ AC_CHECK_LIB(ncurses, tgetent,,
+       )]
+     )]
+   )]
++ )]
+ )
+ 
+ ### deprecate option --enable-widec to turn on use of wide-character support