diff mbox

configure: ignore spice libraries on 32 bit.

Message ID 20120307130139.GD6668@garlic.tlv.redhat.com
State New
Headers show

Commit Message

Alon Levy March 7, 2012, 1:01 p.m. UTC 
On Wed, Mar 07, 2012 at 01:43:36PM +0100, Gerd Hoffmann wrote:
>   Hi,
> 
> > git bisect blames commit 2e1a98c9c "qxl: introduce QXLCookie".
> > Do we need a preprocessor guard so we don't try to use these
> > if the host's spice headers don't support them?
> 
> > (My host is Ubuntu Oneiric with libspice-server-dev 0.8.2-2
> > and spice-protocol-dev 0.8.0-0ubuntu1.)
> 
> Hmm, spice-protocol 0.8.1 adds them.  qemu configure has a hard
> dependency on spice-server 0.8.2 or newer, and I through that
> automagically pulls in a recent enougth spice-protocol too because it is
> needed to build spice-server in the first place.
> 
> Alon?  Did I mix up the versioning?  Or is this a bug in the ubuntu
> package dependencies?

There is no spice-protocol requires in spice-server.pc from 0.8 branch
(took the 0.8.2 commit f0e5a3cb77625b32050f052a8ede7ab0ca008224), This
is the Requires line:
Requires:  pixman-1 >= 0.17.7 celt051 >= 0.5.1.1 alsa openssl xrandr
xfixes x11 xext xrender

so I think we need to add our own.



> 
> cheers,
>   Gerd
>

Comments

Peter Maydell March 7, 2012, 1:54 p.m. UTC | #1 
On 7 March 2012 13:01, Alon Levy <alevy@redhat.com> wrote:
>
> diff --git a/configure b/configure
> index a5eb832..ecdfe9a 100755
> --- a/configure
> +++ b/configure
> @@ -2544,6 +2544,7 @@ EOF
>   spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)
>   spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)
>   if $pkg_config --atleast-version=0.8.2 spice-server >/dev/null 2>&1 && \
> +     $pkg_config --atleast-version=0.8.1 spice-protocol > /dev/null 2>&1 && \
>      compile_prog "$spice_cflags" "$spice_libs" ; then
>     spice="yes"
>     libs_softmmu="$libs_softmmu $spice_libs"

I've confirmed that this change (a) disables spice on the Oneiric system that
was failing to compile and (b) doesn't disable spice on Precise.

Could you submit it as a proper patch with a commit message and
a signed-off-by line?

Thanks
-- PMM
diff mbox

Patch

diff --git a/configure b/configure
index a5eb832..ecdfe9a 100755
--- a/configure
+++ b/configure
@@ -2544,6 +2544,7 @@  EOF
   spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)
   spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)
   if $pkg_config --atleast-version=0.8.2 spice-server >/dev/null 2>&1 && \
+     $pkg_config --atleast-version=0.8.1 spice-protocol > /dev/null 2>&1 && \
      compile_prog "$spice_cflags" "$spice_libs" ; then
     spice="yes"
     libs_softmmu="$libs_softmmu $spice_libs"