From: Carlos Santos <casantos@datacom.ind.br>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 1/2] Revert "util-linux: fix ncurses/wchar handling"
Date: Sun, 22 Jan 2017 01:15:41 -0200 [thread overview]
Message-ID: <1485054942-17504-1-git-send-email-casantos@datacom.ind.br> (raw)
In-Reply-To: <1484301833-16403-1-git-send-email-casantos@datacom.ind.br>
This reverts commit 5a18eabdf08564688761a9b2f35892d69d8f9a18.
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>
---
package/util-linux/Config.in | 5 -----
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 cfb2451..e957f84 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 414465c..51ece90 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
--
2.7.4
next prev parent reply other threads:[~2017-01-22 3:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-13 4:30 [Buildroot] [PATCH 1/1] util-linux: fix ncurses/wchar handling (again) Carlos Santos
2017-01-13 10:03 ` [Buildroot] [PATCH v2] " Carlos Santos
2017-01-17 5:44 ` Thomas Petazzoni
2017-01-17 10:50 ` Carlos Santos
2017-01-17 13:57 ` Marcus Hoffmann
2017-01-19 19:28 ` Carlos Santos
2017-01-20 10:24 ` Carlos Santos
2017-01-21 20:52 ` Carlos Santos
2017-01-22 0:26 ` Carlos Santos
2017-01-22 3:15 ` Carlos Santos [this message]
2017-01-22 3:15 ` [Buildroot] [PATCH v3 2/2] " Carlos Santos
2017-01-22 6:55 ` [Buildroot] [PATCH v3 1/2] Revert "util-linux: fix ncurses/wchar handling" Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485054942-17504-1-git-send-email-casantos@datacom.ind.br \
--to=casantos@datacom.ind.br \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.