qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Michal Suchanek <msuchanek@suse.de>,
	QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH] Fix legacy ncurses detection.
Date: Mon, 7 Nov 2016 17:26:56 +0100	[thread overview]
Message-ID: <20161107172656.1b2c59bb.cornelia.huck@de.ibm.com> (raw)
In-Reply-To: <CAFEAcA8auW70Bpji93ujCjur3q4m3sffAtccv8S2MSzJSkydow@mail.gmail.com>

On Mon, 7 Nov 2016 13:55:29 +0000
Peter Maydell <peter.maydell@linaro.org> wrote:

> On 7 November 2016 at 13:38, Michal Suchanek <msuchanek@suse.de> wrote:
> > ncurses version in SUSE does not have .pc files so this is still needed to
> > build from git.
> >
> > Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> > ---
> >  configure | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/configure b/configure
> > index fd6f898..aab70ef 100755
> > --- a/configure
> > +++ b/configure
> > @@ -2926,7 +2926,7 @@ if test "$curses" != "no" ; then
> >      curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
> >      curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
> >    else
> > -    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):"
> > +    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null)-I/usr/include/ncursesw:"
> >      curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
> 
> I think this will produce malformed output on platforms where
> pkg-config does output something useful:
> -D_GNU_SOURCE -I/usr/include/ncursesw-I/usr/include/ncursesw:
> 
> because there's no colon after the ')'.
> 
> In fact this code looks kind of dubious in general, because
> it seems to assume that the output of pkg_config never has
> a ':' in it...

Didn't see the original patch (mailing list slow?), but I have the same
problem on a SLES12SP1 system (reported some days ago).

The following seems to fix it for me (I can send it with a proper s-o-b
if this looks good). Systems that don't have any cursesw hopefully still
fail properly (I don't have one around to test, though.)

diff --git a/configure b/configure
index fd6f898..825f2b3 100755
--- a/configure
+++ b/configure
@@ -2927,6 +2927,10 @@ if test "$curses" != "no" ; then
     curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
   else
     curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):"
+    if [ "$curses_inc_list" == ":" ]; then
+       # some systems don't provide a proper .pc file for ncursesw
+       curses_inc_list="-I/usr/include/ncursesw:"
+    fi
     curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
   fi
   curses_found=no

  reply	other threads:[~2016-11-07 16:27 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-07 13:38 [Qemu-devel] [PATCH] Fix legacy ncurses detection Michal Suchanek
2016-11-07 13:55 ` Peter Maydell
2016-11-07 16:26   ` Cornelia Huck [this message]
2016-11-07 22:07   ` Samuel Thibault
2016-11-08 11:34     ` Cornelia Huck
2016-11-08 20:10       ` Samuel Thibault
2016-11-09  8:58         ` Cornelia Huck
2016-11-09  9:04           ` Samuel Thibault
2016-11-09  9:12             ` Cornelia Huck
2016-11-09  9:28               ` Samuel Thibault
2016-11-09  9:40                 ` Cornelia Huck
2016-11-09  9:52                   ` Samuel Thibault
2016-11-09 10:04                     ` Cornelia Huck
2016-11-09 10:15                       ` Sergey Smolov
2016-11-09 10:25                         ` Samuel Thibault

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=20161107172656.1b2c59bb.cornelia.huck@de.ibm.com \
    --to=cornelia.huck@de.ibm.com \
    --cc=msuchanek@suse.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).