SPECS: qemu.spec - added TODO - added bcond to pass rpmcflags to M...

[prism]

Author: prism                        Date: Mon Jun 20 16:45:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added TODO
- added bcond to pass rpmcflags to Makefiles
- added fixes for gcc4
- cannot determine proper combination of cflags to build it using gcc4...

---- Files affected:
SPECS:
   qemu.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.25 SPECS/qemu.spec:1.26
--- SPECS/qemu.spec:1.25	Tue May 31 14:17:37 2005
+++ SPECS/qemu.spec	Mon Jun 20 18:45:52 2005
@@ -1,7 +1,11 @@
 # $Revision$, $Date$
 #
+# TODO:
+# - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed.
+#
 # Conditional build:
 %bcond_with	kqemu			# with QEMU accelerator module
+%bcond_with cflags_passing	# with passing rpmcflags to Makefiles
 #
 Summary:	QEMU CPU Emulator
 Summary(pl):	QEMU - emulator procesora
@@ -23,6 +27,8 @@
 Patch2:		%{name}-longjmp.patch
 Patch3:		%{name}-dot.patch
 Patch4:		%{name}-initrd_load_addr.patch
+Patch5:		%{name}-gcc4_x86.patch
+Patch6:		%{name}-gcc4_ppc.patch
 URL:		http://fabrice.bellard.free.fr/qemu/
 BuildRequires:	SDL-devel >= 1.2.1
 BuildRequires:	sed >= 4.0
@@ -75,10 +81,15 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
+%patch6 -p1
+
+%{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure
 
-sed -i -e 's/sdl_static=yes/sdl_static=no/' configure
 # cannot use optflags on x86 - they cause "no register to spill" errors
-#sed -i -e 's/-Wall -O2 -g/-Wall %{rpmcflags}/' Makefile Makefile.target
+%if %{with cflags_passing}
+%{__sed} -i -e 's/-Wall -O2 -g/-Wall %{rpmcflags}/' Makefile Makefile.target
+%endif
 
 %{?with_kqemu:echo -n > kqemu/install.sh}
 
@@ -92,6 +103,7 @@
 %endif
 
 # --extra-cflags don't work (overridden by CFLAGS in Makefile*)
+# they can be passed if the cflags_passing bcond is used
 ./configure \
 	--prefix=%{_prefix} \
 	--cc="%{__cc}" \
@@ -156,6 +168,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2005/06/20 16:45:52  prism
+- added TODO
+- added bcond to pass rpmcflags to Makefiles
+- added fixes for gcc4
+- cannot determine proper combination of cflags to build it using gcc4...
+
 Revision 1.25  2005/05/31 12:17:37  jajcus
 - higher INITRD_LOAD_ADDR, so a big kernel, like that in PLD, can successfully be booted (-initrd_load_addr.patch)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.25&r2=1.26&f=u