From fb45df81fcce89a0481deb15bab4bbac5c83a30e Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 9 Apr 2008 22:12:29 +0000
Subject: qemu-0.9.1: Remove hacky patch and call configure correctly

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4222 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../qemu/qemu-0.9.1/disable-error-in-configure.patch    | 17 -----------------
 meta/packages/qemu/qemu_0.9.1.bb                        |  5 ++---
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 meta/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch

diff --git a/meta/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch b/meta/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch
deleted file mode 100644
index 017f9f635..000000000
--- a/meta/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- configure |    2 --
- 1 file changed, 2 deletions(-)
-
-Index: qemu/configure
-===================================================================
---- qemu.orig/configure	2007-12-03 16:38:38.000000000 +0000
-+++ qemu/configure	2007-12-03 16:38:39.000000000 +0000
-@@ -323,8 +323,6 @@ for opt do
-   ;;
-   --disable-werror) werror="no"
-   ;;
--  *) echo "ERROR: unknown option $opt"; show_help="yes"
--  ;;
-   --disable-nptl) nptl="no"
-   ;;
-   esac
diff --git a/meta/packages/qemu/qemu_0.9.1.bb b/meta/packages/qemu/qemu_0.9.1.bb
index 164296b0d..a51e437f7 100644
--- a/meta/packages/qemu/qemu_0.9.1.bb
+++ b/meta/packages/qemu/qemu_0.9.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
-PR = "r7"
+PR = "r8"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"
@@ -33,7 +33,6 @@ SRC_URI = "\
     file://fix_segfault.patch;patch=1 \
     file://writev_fix.patch;patch=1 \
     file://configure_symlinkpath_fix.patch;patch=1 \
-    file://disable-error-in-configure.patch;patch=1 \
     file://no-strip.patch;patch=1"
 
 S = "${WORKDIR}/qemu-${PV}"
@@ -45,5 +44,5 @@ EXTRA_OECONF += "--disable-gfx-check"
 inherit autotools
 
 do_configure() {
-    oe_runconf
+    ${S}/configure --prefix=${prefix} ${EXTRA_OECONF}
 }
-- 
cgit v1.2.3