X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=qemu.spec;h=293fbe8772bc99e8598661ad01529ef6c5ec3c17;hb=refs%2Ftags%2Fauto%2Fth%2Fqemu-0_9_1-21k;hp=f126da7364cc38ea1c4744c30ce297853e2c21d5;hpb=3f5b9075c542abf02e00ca3b4426f49e9b74c236;p=packages%2Fqemu.git

diff --git a/qemu.spec b/qemu.spec
index f126da7..293fbe8 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,25 +1,16 @@
 #
 # TODO:
 # - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed.
+# - update or drop gcc4 bcond patches
 #
 # Conditional build:
 %bcond_without	kqemu			# disable KQEMU ACCELERATOR support in QEMU
 %bcond_with	cflags_passing		# with passing rpmcflags to Makefiles
 %bcond_with	dosguest		# add special patch when use with DOS as guest os
 %bcond_with	nosdlgui		# do not use SDL gui (use X11 instead)
-# Note that gcc4 build is very problematic and not supported by qemu team
-%bcond_without	gcc4			# use gcc4 patches (broke build on gcc33)
 %bcond_without	dist_kernel		# without distribution kernel
 %bcond_without	kernel			# build kqemu KERNEL MODULES
-%bcond_without	userspace		# don't build userspace
-%bcond_with	grsec_kernel	# build for kernel-grsecurity
-
-%if %{without kernel}
-%undefine	with_dist_kernel
-%endif
-%if %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
+%bcond_without	userspace		# don't build userspace utilities
 
 # no kernel kqemu module for ppc
 %ifarch ppc
@@ -27,15 +18,24 @@
 %undefine      with_kernel
 %endif
 
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
+%endif
+
+%define		__ucc	gcc-3.4
+
+%define		rel	21
 
 %define		kqemu_version	1.3.0pre11
 %define		qemu_version	0.9.1
 %define		pname	qemu
-
-%define		rel	4
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		%{pname}%{_alt_kernel}
@@ -43,25 +43,29 @@ Version:	%{qemu_version}
 Release:	%{rel}%{?with_kqemu:k}
 License:	GPL
 Group:		Applications/Emulators
-#Source0Download: http://fabrice.bellard.free.fr/qemu/download.html
-Source0:	http://fabrice.bellard.free.fr/qemu/%{pname}-%{version}.tar.gz
+# Source0Download: http://fabrice.bellard.free.fr/qemu/download.html
+Source0:	http://bellard.org/qemu/%{pname}-%{version}.tar.gz
 # Source0-md5:	6591df8e9270eb358c881de4ebea1262
-Source1:	http://fabrice.bellard.free.fr/qemu/k%{pname}-%{kqemu_version}.tar.gz
+Source1:	http://bellard.org/qemu/k%{pname}-%{kqemu_version}.tar.gz
 # Source1-md5:	970521874ef8b1ba4598925ace5936c3
 Patch0:		%{pname}-nostatic.patch
 Patch1:		%{pname}-cc.patch
 Patch3:		%{pname}-dot.patch
-Patch4:		%{pname}-gcc4_x86.patch
-Patch5:		%{pname}-gcc4_ppc.patch
 Patch6:		%{pname}-nosdlgui.patch
 # Proof of concept, for reference, do not remove
 Patch8:		%{pname}-kde_virtual_workspaces_hack.patch
-# http://gwenole.beauchesne.info/en/projects/qemu
-Patch9:		%{pname}-0.8.0-gcc4-hacks.patch
-Patch11:	%{pname}-0.7.2-gcc4-opts.patch
 #Patch12:	%{pname}-0.7.2-dyngen-check-stack-clobbers.patch
 Patch13:	%{pname}-dosguest.patch
-URL:		http://fabrice.bellard.free.fr/qemu/
+Patch14:	%{pname}-ppc_old_binutils.patch
+Patch15:	%{pname}-isa-bios-ram.patch
+# below one fixes problems with passing ram size to bios/bootloader
+# which affects coreboot/linuxbios
+Patch16:	%{pname}-piix-ram-size.patch
+Patch17:	%{pname}-CVE-2008-0928.patch
+Patch18:	%{pname}-CVE-2008-2004.patch
+Patch19:	%{pname}-gcc-workaround.patch
+Patch20:	%{pname}-dirent.patch
+URL:		http://bellard.org/qemu/
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -69,7 +73,7 @@ BuildRequires:	rpmbuild(macros) >= 1.379
 %if %{with userspace}
 BuildRequires:	SDL-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
-%{!?with_gcc4:BuildRequires:	gcc < 5:4.0}
+BuildRequires:	compat-gcc-34
 BuildRequires:	perl-tools-pod
 BuildRequires:	sed >= 4.0
 BuildRequires:	tetex
@@ -137,13 +141,6 @@ kqemu - moduł jądra.
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%if %{with gcc4}
-%patch9 -p1
-%patch11 -p1
-#%patch12 -p1
-#%patch4 -p0
-%patch5 -p1
-%endif
 %{?with_nosdlgui:%patch6 -p1}
 #%patch8 -p1
 
@@ -171,15 +168,26 @@ cat <<'EOF' > udev.conf
 KERNEL=="kqemu", NAME="%k", MODE="0666"
 EOF
 
+%if %{with dosguest}
+%patch13 -p1
+%endif
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p2
+%patch18 -p0
+%patch19 -p0
+%patch20 -p1
+
 cd kqemu-%{kqemu_version}
 %{__sed} -i 's#include ../config-host.mak##' ./common/Makefile
 %ifarch %{x8664}
 %{__sed} -i 's/^#ARCH=x86_64/ARCH=x86_64/' ./common/Makefile
-%{__make} -j1 -C common
+%{__make} -C common -j1
 mv -f kqemu-mod-x86_64.o{,.bin}
 %else
 %{__sed} -i 's/^#ARCH=i386/ARCH=i386/' ./common/Makefile
-%{__make} -j1 -C common
+%{__make} -C common -j1
 mv -f kqemu-mod-i386.o{,.bin}
 %endif
 
@@ -194,10 +202,6 @@ EOF
 cd -
 %endif
 
-%if %{with dosguest}
-%patch13 -p1
-%endif
-
 %build
 %if %{with kernel}
 cd kqemu-%{kqemu_version}
@@ -217,15 +221,12 @@ cd -
 # they can be passed if the cflags_passing bcond is used
 ./configure \
 	--prefix=%{_prefix} \
-	--cc="%{__cc}" \
-	--host-cc="%{__cc}" \
+	--cc="%{__ucc}" \
+	--host-cc="%{__ucc}" \
 	--make="%{__make}" \
-%if %{with kqemu}
-	--kernel-path=%{_kernelsrcdir} \
-%else
+%if %{without kqemu}
 	--disable-kqemu \
 %endif
-	%{?with_gcc4:--disable-gcc-check} \
 	--enable-alsa \
 	--interp-prefix=%{_libdir}/%{pname}
 %{__make}