From patchwork Wed May 23 02:11:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136610 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp316295lji; Tue, 22 May 2018 19:13:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqeoQ4efjyiqMXmCzWtceHwvQukjEIxNNXshOcfu7OUvinyIrQh5nSbFUF7e3pE05CInwzE X-Received: by 2002:a63:6887:: with SMTP id d129-v6mr774368pgc.128.1527041580475; Tue, 22 May 2018 19:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527041580; cv=none; d=google.com; s=arc-20160816; b=vcOqWebXiGk5noozkmSYN9506F0RqpzQJNF2SBKUeJzodWdaMNrEG6FeUot0+JrcYc wCpFSlSoUOzxxbCJ4zcmpgLFMUTj9xPa1U2ucXRljPfBwuWRkf1PfxD7vlUmVPZwjPVm WObN2njEymVaXkaJYxgrn6LqM1Nh4Qoj7Bienppv/ioD+fMRtfBDPHL8R3u2SCrggdxO Y62f/TUjCXkOaaEFMEQIPtlOyLPAdsSpwxRk4YJpZ7GED7LWD/JdXYUalYLwqkJ8lgNH h3fGxv+SJlKM/2Jz1gF91B2WQv/HhtspTgcuE6Z9Dbz4Lpbz8AMRGoBOAsAtMrya7rck Jz8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=EI4fz8j9LTbH518zzO73OJupkEB+d7KttWPsIyucgPU=; b=dFMSW4MfGTfcvKKPQZbUaZfs6pMcW+J5nSU74U0eYrYoeVpNY3nO8Znh6SDvG1DLSe H69uX2bE8b1wEjGz230S/UUT5BX8wWZVnWQeWIIzcoS6IBq4yNcpMguxvd3este6xiKv /QHcWho9IZuM/k8zSiSt90E9HIZBWpUIqD7YYVlMMmw+zvaUmUX/OlCYlq1LaUtBIMD9 hWD40MMgcVX2iD5yTCgLsb9sm3Pp16BulXEHx02ebbiXq2rCIrQcO0MB5BFXIHaKT+l8 b8nwxYfhx6G+DA/zP04WzsucCsRKoSMpNhhiBI6as++Q5FrIQFwfr93c/I9NCTjpyUYg QmIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=gITr5dkE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v11-v6si17607073plp.25.2018.05.22.19.13.00; Tue, 22 May 2018 19:13:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=gITr5dkE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753766AbeEWCMt (ORCPT + 30 others); Tue, 22 May 2018 22:12:49 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:20217 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753348AbeEWCMs (ORCPT ); Tue, 22 May 2018 22:12:48 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w4N2BaOW029812; Wed, 23 May 2018 11:11:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w4N2BaOW029812 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1527041497; bh=EI4fz8j9LTbH518zzO73OJupkEB+d7KttWPsIyucgPU=; h=From:To:Cc:Subject:Date:From; b=gITr5dkEpwVwdJPkmAeRseQfAsxA/TdoEqiN7heCzxhc1PKdxnL4yrp75tl6roZ1+ eLraiJckpT+F9Tfwiyq82CkthkIvqup+q+tQhivZUxwTUCqE+we9+VthphuKuZ8NgF SAzBlw0YheaKYquttnsGXh3yUcDbHsW1itz5RDggMz5c0GsoL/fMERHHW5Du/K6t4T HwQgnYzW5K+74H/VlrJf6le2trhtzOHB15aJV07jd1fim91PKvVfUP4EvEAYZXyaiE qfiSxtgq7lD+4HBRUVc6hjnRsN+QElRaitcATRjgjlcUDz+vxn33A1gM4mCSLSYdn5 g4EelgT7foX4A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Ulf Magnusson , Randy Dunlap , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] fixup! kconfig: refactor ncurses package checks for building mconf and nconf Date: Wed, 23 May 2018 11:11:31 +0900 Message-Id: <1527041491-12647-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is redundant to pass -DNCURSES_WIDECHAR=1 explicitly; when we use 'pkg-config --cflags', it takes care of appropriate flags. Actually, 'pkg-config --cflags' will add -D_GNU_SOURCE, which will define _XOPEN_SOURCE_EXTENDED, and NCURSES_WIDECHAR=1, anyway. I added -D_GNU_SOURCE to follow the suggestion of pkg-config for cases where pkg-config is not useful. Signed-off-by: Masahiro Yamada --- The v3 (https://patchwork.kernel.org/patch/10417413/) was reviewed and tested. I'd like to squash this into it. scripts/kconfig/mconf-cfg.sh | 8 ++++---- scripts/kconfig/nconf-cfg.sh | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh index 1c2fe90..e6f9fac 100755 --- a/scripts/kconfig/mconf-cfg.sh +++ b/scripts/kconfig/mconf-cfg.sh @@ -5,7 +5,7 @@ PKG="ncursesw" PKG2="ncurses" if pkg-config --exists $PKG; then - echo cflags=\"-DNCURSES_WIDECHAR=1 $(pkg-config --cflags $PKG)\" + echo cflags=\"$(pkg-config --cflags $PKG)\" echo libs=\"$(pkg-config --libs $PKG)\" exit 0 fi @@ -19,19 +19,19 @@ fi # Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses # by pkg-config. if [ -f /usr/include/ncursesw/ncurses.h ]; then - echo cflags=\"-DNCURSES_WIDECHAR=1 -I/usr/include/ncursesw\" + echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\" echo libs=\"-lncursesw\" exit 0 fi if [ -f /usr/include/ncurses/ncurses.h ]; then - echo cflags=\"-I/usr/include/ncurses\" + echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\" echo libs=\"-lncurses\" exit 0 fi if [ -f /usr/include/ncurses.h ]; then - echo cflags=\"\" + echo cflags=\"-D_GNU_SOURCE\" echo libs=\"-lncurses\" exit 0 fi diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh index 4c95b4e..42f5ac7 100644 --- a/scripts/kconfig/nconf-cfg.sh +++ b/scripts/kconfig/nconf-cfg.sh @@ -5,7 +5,7 @@ PKG="ncursesw menuw panelw" PKG2="ncurses menu panel" if pkg-config --exists $PKG; then - echo cflags=\"-DNCURSES_WIDECHAR=1 $(pkg-config --cflags $PKG)\" + echo cflags=\"$(pkg-config --cflags $PKG)\" echo libs=\"$(pkg-config --libs $PKG)\" exit 0 fi @@ -19,18 +19,19 @@ fi # Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses # by pkg-config. if [ -f /usr/include/ncursesw/ncurses.h ]; then - echo cflags=\"-DNCURSES_WIDECHAR=1 -I/usr/include/ncursesw\" + echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\" echo libs=\"-lncursesw -lmenuw -lpanelw\" exit 0 fi if [ -f /usr/include/ncurses/ncurses.h ]; then - echo cflags=\"-I/usr/include/ncurses\" + echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\" echo libs=\"-lncurses -lmenu -lpanel\" exit 0 fi if [ -f /usr/include/ncurses.h ]; then + echo cflags=\"-D_GNU_SOURCE\" echo libs=\"-lncurses -lmenu -lpanel\" exit 0 fi