mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "util-linux: fix ncurses/wchar handling"

Browse Source 
This reverts commit 5a18eabdf0.

It did not take into account all the possible situations. A different fix
will be provided in a forthcomming patch.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Carlos Santos
2017-01-22 01:15:41 -02:00
committed by Thomas Petazzoni
parent f00a528ce6
commit 051fde24e4
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/util-linux/Config.in
View File

@@ -207,7 +207,6 @@ config BR2_PACKAGE_UTIL_LINUX_MORE
bool "more" bool "more"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR
help help
File perusal filter for crt viewing File perusal filter for crt viewing
@@ -253,7 +252,6 @@ config BR2_PACKAGE_UTIL_LINUX_PG
bool "pg" bool "pg"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR
help help
Browse pagewise through text files Browse pagewise through text files
@@ -300,7 +298,6 @@ config BR2_PACKAGE_UTIL_LINUX_SETPRIV
config BR2_PACKAGE_UTIL_LINUX_SETTERM config BR2_PACKAGE_UTIL_LINUX_SETTERM
bool "setterm" bool "setterm"
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR
help help
Set terminal attributes Set terminal attributes
@@ -313,14 +310,12 @@ config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
config BR2_PACKAGE_UTIL_LINUX_TUNELP config BR2_PACKAGE_UTIL_LINUX_TUNELP
bool "tunelp" bool "tunelp"
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR
help help
Set various parameters for the lp device Set various parameters for the lp device
config BR2_PACKAGE_UTIL_LINUX_UL config BR2_PACKAGE_UTIL_LINUX_UL
bool "ul" bool "ul"
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR
help help
Do underlining Do underlining

20
package/util-linux/util-linux.mk
View File

@@ -45,21 +45,21 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
UTIL_LINUX_DEPENDENCIES += busybox UTIL_LINUX_DEPENDENCIES += busybox
endif endif
ifeq ($(BR2_PACKAGE_NCURSES),y)
UTIL_LINUX_DEPENDENCIES += ncurses
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
UTIL_LINUX_CONF_OPTS += --with-ncursesw
UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
else
UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar
UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
endif
else
ifeq ($(BR2_USE_WCHAR),y) ifeq ($(BR2_USE_WCHAR),y)
UTIL_LINUX_CONF_OPTS += --enable-widechar UTIL_LINUX_CONF_OPTS += --enable-widechar
else else
UTIL_LINUX_CONF_OPTS += --disable-widechar UTIL_LINUX_CONF_OPTS += --disable-widechar
endif endif
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
UTIL_LINUX_DEPENDENCIES += ncurses
UTIL_LINUX_CONF_OPTS += --with-ncursesw
UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
else ifeq ($(BR2_PACKAGE_NCURSES):$(BR2_USE_WCHAR),y:)
UTIL_LINUX_DEPENDENCIES += ncurses
UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses
UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
else
UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses
endif endif