diff options
| author | Ted Hess <thess@kitschensync.net> | 2015-12-08 17:18:16 -0500 |
|---|---|---|
| committer | Ted Hess <thess@kitschensync.net> | 2015-12-11 18:10:14 -0500 |
| commit | befa2ce3e20a240dc454561a2c371cbac20c3b25 (patch) | |
| tree | 5bd6148556c4757019df0f5531adc98539b82991 /utils/zile | |
| parent | 7aa4b19f97374b13ee7b43636e31c13bbfdf30f7 (diff) | |
zile: Remove unecessary dependence on libncurses (non-w) version
Signed-off-by: Ted Hess <thess@kitschensync.net>
Diffstat (limited to 'utils/zile')
| -rw-r--r-- | utils/zile/Makefile | 8 | ||||
| -rw-r--r-- | utils/zile/patches/005-fix_configure_checking_for_ncursesw.patch | 11 | ||||
| -rw-r--r-- | utils/zile/patches/020-build_with_ncursesw.patch | 15 |
3 files changed, 31 insertions, 3 deletions
diff --git a/utils/zile/Makefile b/utils/zile/Makefile index 73b7d1979..c9ab03af7 100644 --- a/utils/zile/Makefile +++ b/utils/zile/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zile PKG_VERSION:=2.3.24 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/zile @@ -22,8 +22,6 @@ PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf PKG_INSTALL:=1 -PKG_BUILD_DEPENDS += libncurses - include $(INCLUDE_DIR)/package.mk define Package/zile @@ -46,6 +44,10 @@ CONFIGURE_VARS += \ gl_cv_warn__Wmudflap=no \ gl_cv_warn__fmudflap=no +CONFIGURE_ARGS += \ + --with-ncursesw \ + + define Package/zile/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ diff --git a/utils/zile/patches/005-fix_configure_checking_for_ncursesw.patch b/utils/zile/patches/005-fix_configure_checking_for_ncursesw.patch new file mode 100644 index 000000000..26ef0ab33 --- /dev/null +++ b/utils/zile/patches/005-fix_configure_checking_for_ncursesw.patch @@ -0,0 +1,11 @@ +--- a/m4/ax_with_curses.m4 ++++ b/m4/ax_with_curses.m4 +@@ -72,7 +72,7 @@ AC_DEFUN([AX_WITH_CURSES], + AC_CACHE_CHECK([for working ncursesw], ax_cv_ncursesw, + [LIBS="$ax_save_LIBS -lncursesw" + AC_TRY_LINK( +- [#include <ncurses.h>], ++ [#include <ncursesw/ncurses.h>], + [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], + ax_cv_ncursesw=yes, ax_cv_ncursesw=no)]) + if test "$ax_cv_ncursesw" = yes diff --git a/utils/zile/patches/020-build_with_ncursesw.patch b/utils/zile/patches/020-build_with_ncursesw.patch new file mode 100644 index 000000000..9a4cffbcb --- /dev/null +++ b/utils/zile/patches/020-build_with_ncursesw.patch @@ -0,0 +1,15 @@ +--- a/src/term_curses.c ++++ b/src/term_curses.c +@@ -23,7 +23,11 @@ + + #include <stdlib.h> + #ifdef HAVE_NCURSES_H +-#include <ncurses.h> ++# ifdef HAVE_NCURSESW ++# include <ncursesw/ncurses.h> ++# else ++# include <ncurses.h> ++# endif + #else + #include <curses.h> + #endif |