rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.8,1.9
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Fri Mar 17 14:57:13 UTC 2006
Author: dwmw2
Update of /cvs/extras/rpms/qemu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14645
Modified Files:
qemu-0.7.0-build.patch qemu.spec
Log Message:
fix i386 and x86_64 builds
qemu-0.7.0-build.patch:
Index: qemu-0.7.0-build.patch
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-0.7.0-build.patch 30 Apr 2005 11:34:52 -0000 1.1
+++ qemu-0.7.0-build.patch 17 Mar 2006 14:57:13 -0000 1.2
@@ -4,7 +4,7 @@
-include config-host.mak
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing
++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing
ifdef CONFIG_DARWIN
CFLAGS+= -mdynamic-no-pic
endif
@@ -15,7 +15,7 @@
DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
endif
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing
++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing
#CFLAGS+=-Werror
LDFLAGS=-g
LIBS=
@@ -24,7 +24,7 @@
# -msmall-data is not used because we want two-instruction relocations
# for the constant constructions
-OP_CFLAGS=-Wall -O2 -g
-+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall
++OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall
# Ensure there's only a single GP
CFLAGS += -msmall-data
LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qemu.spec 17 Mar 2006 00:38:15 -0000 1.8
+++ qemu.spec 17 Mar 2006 14:57:13 -0000 1.9
@@ -1,12 +1,12 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 0.8.0
-Release: 1.1%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
Group: Development/Tools
URL: http://fabrice.bellard.free.fr/qemu
-Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz
+Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
Source1: qemu.init
Patch0: qemu-0.7.0-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -36,7 +36,11 @@
%patch0 -p1
%build
-./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa
+./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \
+%ifarch x86_64
+ --target-list="i386-user arm-user armeb-user ppc-user mips-user mipsel-user i386-softmmu ppc-softmmu x86_64-softmmu mips-softmmu arm-softmmu" \
+%endif
+ --cc=gcc32 --enable-alsa
make
%install
@@ -74,8 +78,12 @@
%config %{_sysconfdir}/rc.d/init.d/qemu
%changelog
-* Fri Mar 17 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-1.1
-- Bump release to work around accidental .fc5 tag in -devel branch
+* Fri Mar 17 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-3
+- Use -mcpu= instead of -mtune= on x86_64 too
+- Disable SPARC targets on x86_64, because dyngen doesn't like fnegs
+
+* Fri Mar 17 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-2
+- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it
* Fri Mar 17 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-1
- Update to 0.8.0
More information about the fedora-extras-commits
mailing list