From 3c6e229022e5bf0a9b4d4fc997fbeee31cf06c2b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 23 Feb 2012 14:21:09 +0000
Subject: [PATCH 1/1] - removed dead code - fixed cflags passing

Changed files:
    qemu-cflags.patch -> 1.1
    qemu.spec -> 1.195
---
 qemu-cflags.patch | 13 +++++++++++++
 qemu.spec         | 17 ++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 qemu-cflags.patch

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
new file mode 100644
index 0000000..248c79c
--- /dev/null
+++ b/qemu-cflags.patch
@@ -0,0 +1,13 @@
+--- qemu-kvm-1.0/configure~	2012-02-22 11:45:58.440892282 +0100
++++ qemu-kvm-1.0/configure	2012-02-23 10:24:12.692463270 +0100
+@@ -2781,10 +2781,6 @@
+ # End of CC checks
+ # After here, no more $cc or $ld runs
+ 
+-if test "$debug" = "no" ; then
+-  CFLAGS="-O2 $CFLAGS"
+-fi
+-
+ # Consult white-list to determine whether to enable werror
+ # by default.  Only enable by default for git builds
+ z_version=`cut -f3 -d. $source_path/VERSION`
diff --git a/qemu.spec b/qemu.spec
index 0bd00d3..f5f511b 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -8,7 +8,6 @@
 #   qemu-0.11.1-*.x86_64.rpm - OK
 #
 # Conditional build:
-%bcond_with	cflags_passing		# with passing rpmcflags to Makefiles
 %bcond_with	nosdlgui		# do not use SDL gui (use X11 instead)
 
 Summary:	QEMU CPU Emulator
@@ -20,6 +19,7 @@ License:	GPL
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu.org/download/%{name}-%{version}.tar.gz
 # Source0-md5:	a64b36067a191451323b0d34ebb44954
+Patch0:		qemu-cflags.patch
 Patch6:		%{name}-nosdlgui.patch
 # Proof of concept, for reference, do not remove
 Patch8:		%{name}-kde_virtual_workspaces_hack.patch
@@ -269,27 +269,18 @@ This package provides the system emulator for xtensa.
 
 %prep
 %setup -q
+%patch0 -p1
 %{?with_nosdlgui:%patch6 -p1}
 #patch8 -p1
 %patch17 -p0
 
-%{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure
-%{__sed} -i 's/.*MAKE) -C kqemu$//' Makefile
-
-# cannot use optflags on x86 - they cause "no register to spill" errors
-%if %{with cflags_passing}
-%{__sed} -i -e 's/-g $CFLAGS/-Wall %{rpmcflags}/' configure
-%else
-%{__sed} -i 's/-g $CFLAGS/-Wall -fno-var-tracking-assignments/' configure
-%endif
-
 # workaround for conflict with alsa/error.h
 ln -s ../error.h qapi/error.h
 
 %build
-# --extra-cflags don't work (overridden by CFLAGS in Makefile*)
-# they can be passed if the cflags_passing bcond is used
 ./configure \
+	--extra-cflags="%{rpmcflags} -I/usr/include/ncurses" \
+	--extra-ldflags="%{rpmldflags}" \
 	--sysconfdir=%{_sysconfdir} \
 	--prefix=%{_prefix} \
 	--cc="%{__cc}" \
-- 
2.44.0