From patchwork Wed Jul 31 17:12:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 263771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 161A22C009D for ; Thu, 1 Aug 2013 03:12:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D16C292D12; Wed, 31 Jul 2013 17:12:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xnkYfsXgQ8zi; Wed, 31 Jul 2013 17:12:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 640428C08A; Wed, 31 Jul 2013 17:12:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id F058D1BFA14 for ; Wed, 31 Jul 2013 17:13:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B4C068EDAA for ; Wed, 31 Jul 2013 17:12:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id otgDSePxlYvu for ; Wed, 31 Jul 2013 17:12:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id EDF9E8ED86 for ; Wed, 31 Jul 2013 17:12:42 +0000 (UTC) Received: from asgard (host128.190-138-194.telecom.net.ar [190.138.194.128]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r6VHCa5u007184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 31 Jul 2013 17:12:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1375290760; bh=GetmbTfeQMibqnXIEWWfBAa0x2/ttFLaAue4y344eD4=; h=From:To:Cc:Subject:Date; b=uWwcefnMP5YDQPqTsQLHCF+kMMHzj86gRlPhM+mJKqCkqw+06qd3hhBM5+u5SHfId tjV386gLMtuworauW8HOXmupzY5RawTqPtbK7nP43OyNgKP7c+fFBKkAXqtW/qkz2B czwF0O74gjNA9epRf4iU0N4ufnus9GJg1z+YShbA= Received: by asgard (sSMTP sendmail emulation); Wed, 31 Jul 2013 14:12:35 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 31 Jul 2013 14:12:35 -0300 Message-Id: <1375290755-15756-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCHv2] libedit: really needs wchar support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net wctype.h is always included, even in configure tests. Fixes: http://autobuild.buildroot.net/results/ed8/ed85b9d688ad8389895e3ecd7a6a18151efc328d/ Signed-off-by: Gustavo Zacarias Acked-by: "Yann E. MORIN" --- package/libedit/Config.in | 4 ++++ package/libedit/libedit.mk | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) -- 1.8.1.5 diff --git a/package/libedit/Config.in b/package/libedit/Config.in index 4747a38..72b0cf1 100644 --- a/package/libedit/Config.in +++ b/package/libedit/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBEDIT bool "libedit" + depends on BR2_USE_WCHAR select BR2_PACKAGE_NCURSES help The editline library (from BSD) provides generic line editing @@ -12,3 +13,6 @@ config BR2_PACKAGE_LIBEDIT in Buildroot as it makes it much simpler than using the upstream sources which require pmake: http://www.thrysoee.dk/editline/ + +comment "libedit requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index 6769fdc..0ff418a 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -12,6 +12,9 @@ LIBEDIT_DEPENDENCIES = ncurses # We're patching configure.ac LIBEDIT_AUTORECONF = YES +# Doesn't really support !wchar, but support is disabled otherwise +LIBEDIT_CONF_OPT += --enable-widec + # Note: libbsd required for *vis functions, but works only with a toolchain # with __progname; otherwise, some features are disabled, as if libbsd was # missing entirely. @@ -19,11 +22,4 @@ ifeq ($(BR2_PACKAGE_LIBBSD),y) LIBEDIT_DEPENDENCIES += libbsd endif -# Wide-char support is not autodetected by configure, we have to help a bit. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_WCHAR),y) -LIBEDIT_CONF_OPT += --enable-widec -else -LIBEDIT_CONF_OPT += --disable-widec -endif - $(eval $(autotools-package))