From: "Bjørn Forsman" <bjorn.forsman@gmail.com>
To: yann.morin.1998@free.fr
Cc: linux-kbuild@vger.kernel.org, "Bjørn Forsman" <bjorn.forsman@gmail.com>
Subject: [PATCH] kconfig/lxdialog: get ncurses CFLAGS with pkg-config
Date: Tue, 31 Dec 2013 01:04:30 +0100 [thread overview]
Message-ID: <1388448270-28832-1-git-send-email-bjorn.forsman@gmail.com> (raw)
check-lxdialog.sh has functions for finding ncurses linker and compiler
flags; ldflags() and ccflags().
ldflags() tries to get linker flags from pkg-config and has a fallback
if pkg-config fails. But ccflags() currently doesn't use pkg-config at
all, instead it does manual checks like this:
if [ -f /usr/include/ncursesw/curses.h ]; then
echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
echo ' -DNCURSES_WIDECHAR=1'
elif [ -f /usr/include/ncurses/ncurses.h ]; then
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
[...]
This patch changes ccflags() so that it also tries pkg-config first, and
only if pkg-config fails does it go back to the fallback/manual checks.
This makes ldflags()/ccflags() symmetric (both try to use pkg-config
before falling back to manual checks) and has the nice side-effect of
making "make menuconfig" work on systems where ncurses is not installed
in a standard location (such as on NixOS).
Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
---
scripts/kconfig/lxdialog/check-lxdialog.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 9d2a4c5..5075ebf 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -21,7 +21,11 @@ ldflags()
# Where is ncurses.h?
ccflags()
{
- if [ -f /usr/include/ncursesw/curses.h ]; then
+ if pkg-config --cflags ncursesw 2>/dev/null; then
+ echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
+ elif pkg-config --cflags ncurses 2>/dev/null; then
+ echo '-DCURSES_LOC="<ncurses.h>"'
+ elif [ -f /usr/include/ncursesw/curses.h ]; then
echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
echo ' -DNCURSES_WIDECHAR=1'
elif [ -f /usr/include/ncurses/ncurses.h ]; then
--
1.8.5.2
next reply other threads:[~2013-12-31 0:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-31 0:04 Bjørn Forsman [this message]
2014-03-08 15:04 ` [PATCH] kconfig/lxdialog: get ncurses CFLAGS with pkg-config Bjørn Forsman
2014-07-11 15:34 Bjørn Forsman
2014-09-14 10:57 Bjørn Forsman
2014-09-23 14:08 ` Michal Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388448270-28832-1-git-send-email-bjorn.forsman@gmail.com \
--to=bjorn.forsman@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.