Commit 423903b1 authored by Thierry Bultel's avatar Thierry Bultel Committed by Thomas Petazzoni
Browse files

ncurses: add support for 256 colors 



[Thomas: fixup nano to use $(NCURSES_CONFIG_SCRIPTS) now that the
ncurses config script can have a different name depending on the
configuration.]

Signed-off-by: default avatarThierry Bultel <tbultel@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c6ca6fc9

package/nano/nano.mk

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ NANO_CONF_OPTS = --without-slang 
NANO_DEPENDENCIES = ncurses



ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)

	NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG="$(STAGING_DIR)/usr/bin/ncursesw5-config"

	NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)

else

	NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false

	NANO_MAKE_ENV += CURSES_LIB="-lncurses"

package/ncurses/ncurses.mk

+12 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ HOST_NCURSES_DEPENDENCIES = 
NCURSES_PROGS = clear infocmp tabs tic toe tput tset

NCURSES_LICENSE = MIT with advertising clause

NCURSES_LICENSE_FILES = README

NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)5-config

NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)$(NCURSES_ABI_VERSION)-config



NCURSES_CONF_OPTS = \

	--without-cxx \
@@ -94,10 +94,19 @@ NCURSES_LINK_STAGING_LIBS = \ 


NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC,$(STAGING_DIR))



NCURSES_CONF_OPTS += --enable-ext-colors

NCURSES_ABI_VERSION = 6

define NCURSES_INSTALL_TARGET_256_COLORS_TERMINFO

	cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm+256color $(TARGET_DIR)/usr/share/terminfo/x

	cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-256color $(TARGET_DIR)/usr/share/terminfo/x

endef



NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS

NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_PC



endif

else # BR2_PACKAGE_NCURSES_WCHAR

NCURSES_ABI_VERSION = 5

endif # BR2_PACKAGE_NCURSES_WCHAR



ifneq ($(BR2_ENABLE_DEBUG),y)

NCURSES_CONF_OPTS += --without-debug
@@ -140,6 +149,7 @@ define NCURSES_INSTALL_TARGET_CMDS 
	cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x

	cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-color $(TARGET_DIR)/usr/share/terminfo/x

	cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm-xfree86 $(TARGET_DIR)/usr/share/terminfo/x

	$(NCURSES_INSTALL_TARGET_256_COLORS_TERMINFO)

	mkdir -p $(TARGET_DIR)/usr/share/terminfo/v

	cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt100 $(TARGET_DIR)/usr/share/terminfo/v

	cp -dpf $(STAGING_DIR)/usr/share/terminfo/v/vt102 $(TARGET_DIR)/usr/share/terminfo/v