Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 340e01248478ba8b78a6d4d1809b1eff > files > 324

kvm-83-270.el5_11.src.rpm

From 49c37feb0bd9dc9b57be68d96683aa1b00e94450 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 24 Sep 2010 19:56:39 -0300
Subject: [PATCH 1/2] don't link qemu-* tools against spice libs

RH-Author: Eduardo Habkost <ehabkost@redhat.com>
Message-id: <1285358199-5202-1-git-send-email-ehabkost@redhat.com>
Patchwork-id: 12272
O-Subject: [RHEL5 kvm PATCH] don't link qemu-* tools against spice libs
Bugzilla: 514578
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: john cooper <john.cooper@redhat.com>

Bugzilla: 514578

As the Makefile $(LIBS) definition is used only to build the qemu-* tools, not
qemu-kvm, we can simply not add the spice libs to $(LIBS). qemu-kvm is built at
Makefile.target, that has its own definition of $(LIBS) that includes the spice
libs.

Upstream status: issue is not present upstream: build code is very different
                 (and more flexible), and spice support is not present

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/qemu/Makefile b/qemu/Makefile
index d9def02..c8a23e5 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -176,7 +176,9 @@ endif
 
 ifdef CONFIG_SPICE
 CFLAGS+=$(SPICE_CFLAGS)
-LIBS+=$(SPICE_LIBS)
+# SPICE_LIBS is not needed for the qemu-* tools. qemu-kvm is built by
+# Makefile.target, that has its own definition of $(LIBS)
+#LIBS+=$(SPICE_LIBS)
 endif
 
 ifdef CONFIG_SLIRP
-- 
1.6.5.5