From patchwork Fri Mar 1 15:50:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin X-Patchwork-Id: 2202021 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 6A02B3FCF6 for ; Fri, 1 Mar 2013 15:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751588Ab3CAPut (ORCPT ); Fri, 1 Mar 2013 10:50:49 -0500 Received: from mail.not-your-server.de ([78.46.182.243]:60170 "EHLO mail.not-your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751436Ab3CAPus (ORCPT ); Fri, 1 Mar 2013 10:50:48 -0500 Received: from localhost (mail.not-your-server.de [127.0.0.1]) by mail.not-your-server.de (Postfix) with ESMTP id AE1F255EEF; Fri, 1 Mar 2013 16:50:47 +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 M15Cm4ZwPeGR; Fri, 1 Mar 2013 16:50:47 +0100 (CET) Received: from paul.ics.kfa-juelich.de (unknown [10.11.12.34]) by mail.not-your-server.de (Postfix) with ESMTP id E504255EF2; Fri, 1 Mar 2013 16:50:46 +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: Fri, 1 Mar 2013 16:50:44 +0100 Message-Id: <1362153044-23611-3-git-send-email-jlec@gentoo.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1362153044-23611-1-git-send-email-jlec@gentoo.org> References: <1362153044-23611-1-git-send-email-jlec@gentoo.org> 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) or in very recent version even a pkg-config module 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 231b475..cc81db5 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -219,7 +219,11 @@ 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 \ + pkg-config --libs ncurses 2>/dev/null \ + || ncurses5-config --libs 2>/dev/null \ + || ncurses6-config --libs 2>/dev/null ) $(obj)/qconf.o: $(obj)/.tmp_qtcheck ifeq ($(qconf-target),1)