From patchwork Thu Feb 28 11:52:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin X-Patchwork-Id: 2197161 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 92AF33FCF6 for ; Thu, 28 Feb 2013 11:52:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752556Ab3B1LwV (ORCPT ); Thu, 28 Feb 2013 06:52:21 -0500 Received: from mail.not-your-server.de ([78.46.182.243]:56350 "EHLO mail.not-your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040Ab3B1LwU (ORCPT ); Thu, 28 Feb 2013 06:52:20 -0500 Received: from localhost (mail.not-your-server.de [127.0.0.1]) by mail.not-your-server.de (Postfix) with ESMTP id 60E3655EEF; Thu, 28 Feb 2013 12:52:17 +0100 (CET) X-Virus-Scanned: amavisd-new at not-your-server.de Received: from mail.not-your-server.de ([127.0.0.1]) by localhost (mail.not-your-server.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cWJ3iN-LRPOq; Thu, 28 Feb 2013 12:52:16 +0100 (CET) Received: from paul.ics.kfa-juelich.de.ics.kfa-juelich.de (unknown [10.11.12.34]) by mail.not-your-server.de (Postfix) with ESMTP id BF63B55ED4; Thu, 28 Feb 2013 12:52:16 +0100 (CET) From: jlec@gentoo.org To: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Justin Lecher Subject: [PATCH] menuconfig: use config scripts to detect ncurses libs Date: Thu, 28 Feb 2013 12:52:15 +0100 Message-Id: <1362052335-17913-1-git-send-email-jlec@gentoo.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Justin Lecher When building ncurses with --with-termlib several symbols get moved from libncurses.so to libtinfo.so. Thus when linking with libncurses.so, one additionally needs to link with libtinfo.so. Ncurses provides a config script (ncurses5-config) to assist finding ncurses. This patch replaces the old heuristic for detection of ncurses libs for linking the ncurses menuconfig dialog by the use of the config scripts. This results in the requirement of ncurses version 5.6 or newer for menuconfig. Signed-off-by: Justin Lecher --- scripts/kconfig/lxdialog/check-lxdialog.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index c8e8a71..10df55b 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh @@ -4,15 +4,8 @@ # What library to link ldflags() { - for ext in so a dll.a dylib ; do - for lib in ncursesw ncurses curses ; do - $cc -print-file-name=lib${lib}.${ext} | grep -q / - if [ $? -eq 0 ]; then - echo "-l${lib}" - exit - fi - done - done + ncursesw5-config --libs 2>/dev/null && exit + ncurses5-config --libs 2>/dev/null && exit exit 1 }