qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	qemu-devel@nongnu.org, patches@linaro.org
Subject: Re: [Qemu-devel] [PATCH] configure: Work around broken static pkg-config info for Ubuntu gnutls
Date: Fri, 24 Jul 2015 18:35:30 +0100	[thread overview]
Message-ID: <20150724173530.GZ6880@redhat.com> (raw)
In-Reply-To: <1437758888-22486-1-git-send-email-peter.maydell@linaro.org>

On Fri, Jul 24, 2015 at 06:28:08PM +0100, Peter Maydell wrote:
> Unfortunately Ubuntu's pkg-config information for gnutls is broken
> for the static linking case, and outputs --libs options which the
> compiler does not recognize. Work around this problem by testing
> that the --cflags/--libs output will at least allow compilation
> before enabling gnutls support.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

Looks like a reasonable approach to me.

> ---
>  configure | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index cc0338d..704b34c 100755
> --- a/configure
> +++ b/configure
> @@ -2116,10 +2116,26 @@ fi
>  ##########################################
>  # GNUTLS probe
>  
> +gnutls_works() {
> +    # Unfortunately some distros have bad pkg-config information for gnutls
> +    # such that it claims to exist but you get a compiler error if you try
> +    # to use the options returned by --libs. Specifically, Ubuntu for --static
> +    # builds doesn't work:
> +    # https://bugs.launchpad.net/ubuntu/+source/gnutls26/+bug/1478035
> +    #
> +    # So sanity check the cflags/libs before assuming gnutls can be used.
> +    if ! $pkg_config --exists "gnutls"; then
> +        return 1
> +    fi
> +
> +    write_c_skeleton
> +    compile_prog "$($pkg_config --cflags gnutls)" "$($pkg_config --libs gnutls)"
> +}
> +
>  gnutls_gcrypt=no
>  gnutls_nettle=no
>  if test "$gnutls" != "no"; then
> -    if $pkg_config --exists "gnutls"; then
> +    if gnutls_works; then
>          gnutls_cflags=`$pkg_config --cflags gnutls`
>          gnutls_libs=`$pkg_config --libs gnutls`
>          libs_softmmu="$gnutls_libs $libs_softmmu"

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

  reply	other threads:[~2015-07-24 17:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-24 17:28 [Qemu-devel] [PATCH] configure: Work around broken static pkg-config info for Ubuntu gnutls Peter Maydell
2015-07-24 17:35 ` Daniel P. Berrange [this message]
2015-07-27 16:09   ` Peter Maydell

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=20150724173530.GZ6880@redhat.com \
    --to=berrange@redhat.com \
    --cc=patches@linaro.org \
    --cc=pbonzini@redhat.com \
    --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).