rpms/qemu/devel qemu-add-cache-utils-to-block-objs.patch, NONE, 1.1 qemu.spec, 1.87, 1.88

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26576

Modified Files:
	qemu.spec 
Added Files:
	qemu-add-cache-utils-to-block-objs.patch 
Log Message:
Fix build on ppc


qemu-add-cache-utils-to-block-objs.patch:

--- NEW FILE qemu-add-cache-utils-to-block-objs.patch ---
diff -up ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs ./qemu-kvm-devel-85/qemu/Makefile
--- ./qemu-kvm-devel-85/qemu/Makefile.add-cache-utils-to-block-objs	2009-04-27 15:54:16.000000000 +0100
+++ ./qemu-kvm-devel-85/qemu/Makefile	2009-04-27 15:53:51.000000000 +0100
@@ -49,7 +49,7 @@ recurse-all: $(SUBDIR_RULES)
 #######################################################################
 # BLOCK_OBJS is code used by both qemu system emulation and qemu-img
 
-BLOCK_OBJS=cutils.o qemu-malloc.o
+BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o
 BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
 BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
 BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- qemu.spec	27 Apr 2009 14:25:54 -0000	1.87
+++ qemu.spec	27 Apr 2009 14:56:36 -0000	1.88
@@ -37,6 +37,9 @@
 # Disable preadv()/pwritev() until bug #497429 is fixed
 Patch07: qemu-disable-preadv.patch
 
+# Fix build on ppc; cutils.c needs cache-utils.c
+Patch08: qemu-add-cache-utils-to-block-objs.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -219,6 +222,7 @@
 %patch05 -p1 -b .virtio-blk-boot-on
 %patch06 -p1 -b .framebuffer-build-fix
 %patch07 -p1 -b .disable-preadv
+%patch08 -p1 -b .add-cache-utils-to-block-objs
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -465,6 +469,7 @@
 - Drop upstreamed patches
 - Fix missing kernel/include/asm symlink in upstream tarball
 - Fix target-arm build
+- Fix build on ppc
 - Disable preadv()/pwritev() until bug #497429 is fixed
 - Kill more .kernelrelease uselessness
 - Make non-kvm qemu build verbose