SPECS: qemu.spec - conditional use gcc4 patches - broke build on i...

[undefine]

Author: undefine                     Date: Fri Dec 23 15:05:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conditional use gcc4 patches - broke build on i386/i586
- use FHS-compatibile path to emulated libraries

---- Files affected:
SPECS:
   qemu.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.41 SPECS/qemu.spec:1.42
--- SPECS/qemu.spec:1.41	Wed Dec 21 04:15:28 2005
+++ SPECS/qemu.spec	Fri Dec 23 16:05:04 2005
@@ -7,6 +7,7 @@
 %bcond_with	kqemu			# with QEMU accelerator module
 %bcond_with	cflags_passing		# with passing rpmcflags to Makefiles
 %bcond_with	nosdlgui		# do not use SDL gui (use X11 instead)
+%bcond_with	gcc4			# use gcc4 patches (broke build on gcc33)
 %bcond_without	dist_kernel		# without distribution kernel
 %bcond_without	kernel			# don't build kernel modules
 %bcond_without	smp			# don't build SMP module
@@ -132,8 +133,10 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if %{with gcc4}
 %patch5 -p0
 %patch6 -p1
+%endif
 # probably not needed
 # %patch7 -p1
 %{?with_nosdlgui:%patch8 -p1}
@@ -187,7 +190,8 @@
 	--cc="%{__cc}" \
 	--enable-alsa \
 	%{!?with_kqemu:--disable-kqemu} \
-	--make="%{__make}"
+	--make="%{__make}" \
+	--interp-prefix=%{_libdir}/%{name}
 %{__make}
 %endif
 
@@ -286,6 +290,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2005/12/23 15:05:04  undefine
+- conditional use gcc4 patches - broke build on i386/i586
+- use FHS-compatibile path to emulated libraries
+
 Revision 1.41  2005/12/21 03:15:28  charles
 - added ALSA driver support
 
================================================================

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