From patchwork Sun Jan 22 03:15:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 718119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v5fjX0hMCz9svs for ; Sun, 22 Jan 2017 14:16:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 74A7585EE3; Sun, 22 Jan 2017 03:16:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LsyqKESXonQU; Sun, 22 Jan 2017 03:16:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 70A9985F5E; Sun, 22 Jan 2017 03:16:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 14C351C2520 for ; Sun, 22 Jan 2017 03:16:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CB70D30339 for ; Sun, 22 Jan 2017 03:16:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3GrOiSAh0Z0h for ; Sun, 22 Jan 2017 03:16:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by silver.osuosl.org (Postfix) with ESMTPS id A624730338 for ; Sun, 22 Jan 2017 03:16:00 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id 29AEC1A06288 for ; Sun, 22 Jan 2017 01:12:26 -0200 (BRST) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 185171A06285 for ; Sun, 22 Jan 2017 01:12:26 -0200 (BRST) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id rnHDHUTVh0_f for ; Sun, 22 Jan 2017 01:12:25 -0200 (BRST) Received: from p7-1130br.casantos.org (unknown [177.134.41.200]) by mail.datacom.ind.br (Postfix) with ESMTPSA id C1BF51A0627F for ; Sun, 22 Jan 2017 01:12:25 -0200 (BRST) From: Carlos Santos To: buildroot@buildroot.org Date: Sun, 22 Jan 2017 01:15:41 -0200 Message-Id: <1485054942-17504-1-git-send-email-casantos@datacom.ind.br> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484301833-16403-1-git-send-email-casantos@datacom.ind.br> References: <1484301833-16403-1-git-send-email-casantos@datacom.ind.br> In-Reply-To: <1484301833-16403-1-git-send-email-casantos@datacom.ind.br> References: <1484301833-16403-1-git-send-email-casantos@datacom.ind.br> Subject: [Buildroot] [PATCH v3 1/2] Revert "util-linux: fix ncurses/wchar handling" X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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