diff options
| -rw-r--r-- | package/util-linux/Config.in | 5 | ||||
| -rw-r--r-- | package/util-linux/util-linux.mk | 20 |
2 files changed, 10 insertions, 15 deletions
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index cfb245123d..e957f848bb 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -207,7 +207,6 @@ config BR2_PACKAGE_UTIL_LINUX_MORE bool "more" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help File perusal filter for crt viewing @@ -253,7 +252,6 @@ config BR2_PACKAGE_UTIL_LINUX_PG bool "pg" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Browse pagewise through text files @@ -300,7 +298,6 @@ config BR2_PACKAGE_UTIL_LINUX_SETPRIV config BR2_PACKAGE_UTIL_LINUX_SETTERM bool "setterm" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Set terminal attributes @@ -313,14 +310,12 @@ config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT config BR2_PACKAGE_UTIL_LINUX_TUNELP bool "tunelp" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Set various parameters for the lp device config BR2_PACKAGE_UTIL_LINUX_UL bool "ul" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Do underlining diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 414465cff6..51ece90b63 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -45,21 +45,21 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) UTIL_LINUX_DEPENDENCIES += busybox endif -ifeq ($(BR2_USE_WCHAR),y) -UTIL_LINUX_CONF_OPTS += --enable-widechar -else -UTIL_LINUX_CONF_OPTS += --disable-widechar -endif - -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +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 ifeq ($(BR2_PACKAGE_NCURSES):$(BR2_USE_WCHAR),y:) -UTIL_LINUX_DEPENDENCIES += ncurses -UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses +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) +UTIL_LINUX_CONF_OPTS += --enable-widechar else +UTIL_LINUX_CONF_OPTS += --disable-widechar +endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif |
