rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.2,1.3 qemu.spec,1.9,1.10

David Woodhouse (dwmw2) fedora-extras-commits at redhat.com
Sat Mar 18 18:35:40 UTC 2006


Author: dwmw2

Update of /cvs/extras/rpms/qemu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23283

Modified Files:
	qemu-0.7.0-build.patch qemu.spec 
Log Message:
filter out more compiler options

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu-0.7.0-build.patch	17 Mar 2006 14:57:13 -0000	1.2
+++ qemu-0.7.0-build.patch	18 Mar 2006 18:35:40 -0000	1.3
@@ -4,7 +4,7 @@
  -include config-host.mak
  
 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
-+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing 
++CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(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=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing 
++CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(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=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall
++OP_CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing 
  # 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qemu.spec	17 Mar 2006 14:57:13 -0000	1.9
+++ qemu.spec	18 Mar 2006 18:35:40 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL/LGPL
 Group: Development/Tools
@@ -78,6 +78,9 @@
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Sat Mar 18 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-4
+- Disable stack-protector options which gcc 3.2 doesn't like
+
 * 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




More information about the fedora-extras-commits mailing list