diff options
author | Richard Purdie <richard@openedhand.com> | 2008-04-09 22:12:29 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-04-09 22:12:29 +0000 |
commit | fb45df81fcce89a0481deb15bab4bbac5c83a30e (patch) | |
tree | 08b9a446663e0673459bb51c5e30a8c8930056de /meta/packages/qemu | |
parent | 26a637aed7bbed1c0c8f736b08e9ac0783823798 (diff) | |
download | poky-fb45df81fcce89a0481deb15bab4bbac5c83a30e.tar.gz |
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
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r-- | meta/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch | 17 | ||||
-rw-r--r-- | meta/packages/qemu/qemu_0.9.1.bb | 5 |
2 files changed, 2 insertions, 20 deletions
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 017f9f6355..0000000000 --- a/meta/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | --- | ||
2 | configure | 2 -- | ||
3 | 1 file changed, 2 deletions(-) | ||
4 | |||
5 | Index: qemu/configure | ||
6 | =================================================================== | ||
7 | --- qemu.orig/configure 2007-12-03 16:38:38.000000000 +0000 | ||
8 | +++ qemu/configure 2007-12-03 16:38:39.000000000 +0000 | ||
9 | @@ -323,8 +323,6 @@ for opt do | ||
10 | ;; | ||
11 | --disable-werror) werror="no" | ||
12 | ;; | ||
13 | - *) echo "ERROR: unknown option $opt"; show_help="yes" | ||
14 | - ;; | ||
15 | --disable-nptl) nptl="no" | ||
16 | ;; | ||
17 | esac | ||
diff --git a/meta/packages/qemu/qemu_0.9.1.bb b/meta/packages/qemu/qemu_0.9.1.bb index 164296b0d4..a51e437f77 100644 --- a/meta/packages/qemu/qemu_0.9.1.bb +++ b/meta/packages/qemu/qemu_0.9.1.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | LICENSE = "GPL" | 1 | LICENSE = "GPL" |
2 | DEPENDS = "zlib" | 2 | DEPENDS = "zlib" |
3 | PR = "r7" | 3 | PR = "r8" |
4 | 4 | ||
5 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" | 5 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" |
6 | FILESDIR = "${WORKDIR}" | 6 | FILESDIR = "${WORKDIR}" |
@@ -33,7 +33,6 @@ SRC_URI = "\ | |||
33 | file://fix_segfault.patch;patch=1 \ | 33 | file://fix_segfault.patch;patch=1 \ |
34 | file://writev_fix.patch;patch=1 \ | 34 | file://writev_fix.patch;patch=1 \ |
35 | file://configure_symlinkpath_fix.patch;patch=1 \ | 35 | file://configure_symlinkpath_fix.patch;patch=1 \ |
36 | file://disable-error-in-configure.patch;patch=1 \ | ||
37 | file://no-strip.patch;patch=1" | 36 | file://no-strip.patch;patch=1" |
38 | 37 | ||
39 | S = "${WORKDIR}/qemu-${PV}" | 38 | S = "${WORKDIR}/qemu-${PV}" |
@@ -45,5 +44,5 @@ EXTRA_OECONF += "--disable-gfx-check" | |||
45 | inherit autotools | 44 | inherit autotools |
46 | 45 | ||
47 | do_configure() { | 46 | do_configure() { |
48 | oe_runconf | 47 | ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} |
49 | } | 48 | } |