From patchwork Thu Feb 28 09:59:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin X-Patchwork-Id: 2196421 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 25CE3DF2A2 for ; Thu, 28 Feb 2013 09:59:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752083Ab3B1J7Y (ORCPT ); Thu, 28 Feb 2013 04:59:24 -0500 Received: from mail.not-your-server.de ([78.46.182.243]:56010 "EHLO mail.not-your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751667Ab3B1J7X (ORCPT ); Thu, 28 Feb 2013 04:59:23 -0500 Received: from localhost (mail.not-your-server.de [127.0.0.1]) by mail.not-your-server.de (Postfix) with ESMTP id 5294555ED5; Thu, 28 Feb 2013 10:59:20 +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 NnXlzgZ5wYON; Thu, 28 Feb 2013 10:59:19 +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 9DD0D55ED4; Thu, 28 Feb 2013 10:59:19 +0100 (CET) From: jlec@gentoo.org To: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Justin Lecher Subject: [PATCH 2/2] kconfig: use config scripts to detect ncurses libs Date: Thu, 28 Feb 2013 10:59:17 +0100 Message-Id: <1362045557-9123-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 makes use of it to detect the necessary libs for linking of the ncurses nconfig dialog. Signed-off-by: Justin Lecher --- scripts/kconfig/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 3091794..c372976 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -216,7 +216,9 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses +HOSTLOADLIBES_nconf = -lmenu -lpanel +HOSTLOADLIBES_nconf += $(shell ncursesw5-config --libs 2>/dev/null \ + || ncurses5-config --libs 2>/dev/null ) $(obj)/qconf.o: $(obj)/.tmp_qtcheck ifeq ($(qconf-target),1)