summaryrefslogtreecommitdiffstats
path: root/meta/packages/qemu
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-24 11:14:32 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-24 11:14:32 +0100
commit75563817929fa7cf9a5cbd4cb46f43aa16978a7d (patch)
tree4dfa217844db07b205cbf1540ffad05e6b4b63ce /meta/packages/qemu
parent362d3886f52d6d4bae57adf81b7dcbd846217dd1 (diff)
downloadpoky-75563817929fa7cf9a5cbd4cb46f43aa16978a7d.tar.gz
qemu: Fix for machines without zlib headers/library installed
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r--meta/packages/qemu/qemu-git/zlibsearch.patch13
-rw-r--r--meta/packages/qemu/qemu-sdk_git.bb2
-rw-r--r--meta/packages/qemu/qemu_git.bb5
3 files changed, 17 insertions, 3 deletions
diff --git a/meta/packages/qemu/qemu-git/zlibsearch.patch b/meta/packages/qemu/qemu-git/zlibsearch.patch
new file mode 100644
index 0000000000..6d7cf03055
--- /dev/null
+++ b/meta/packages/qemu/qemu-git/zlibsearch.patch
@@ -0,0 +1,13 @@
1Index: git/configure
2===================================================================
3--- git.orig/configure 2009-05-24 11:12:34.000000000 +0100
4+++ git/configure 2009-05-24 11:12:55.000000000 +0100
5@@ -749,7 +749,7 @@
6 #include <zlib.h>
7 int main(void) { zlibVersion(); return 0; }
8 EOF
9-if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lz > /dev/null 2> /dev/null ; then
10+if $cc $CFLAGS $LDFLAGS $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lz > /dev/null 2> /dev/null ; then
11 :
12 else
13 echo
diff --git a/meta/packages/qemu/qemu-sdk_git.bb b/meta/packages/qemu/qemu-sdk_git.bb
index 9819d973ec..8a04d90dab 100644
--- a/meta/packages/qemu/qemu-sdk_git.bb
+++ b/meta/packages/qemu/qemu-sdk_git.bb
@@ -1,6 +1,6 @@
1require qemu_git.bb 1require qemu_git.bb
2require qemu-sdk.inc 2require qemu-sdk.inc
3 3
4PR = "r1" 4PR = "r2"
5 5
6EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu --disable-vnc-tls" 6EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu --disable-vnc-tls"
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/packages/qemu/qemu_git.bb
index fc6d9dc553..b92ecf5520 100644
--- a/meta/packages/qemu/qemu_git.bb
+++ b/meta/packages/qemu/qemu_git.bb
@@ -1,7 +1,7 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2DEPENDS = "zlib" 2DEPENDS = "zlib"
3PV = "0.10.2+git${SRCREV}" 3PV = "0.10.2+git${SRCREV}"
4PR = "r0" 4PR = "r1"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" 6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
7 7
@@ -18,7 +18,8 @@ SRC_URI = "\
18 file://workaround_bad_futex_headers.patch;patch=1 \ 18 file://workaround_bad_futex_headers.patch;patch=1 \
19 file://qemu-add-gl-host-code.patch;patch=1 \ 19 file://qemu-add-gl-host-code.patch;patch=1 \
20 file://no-strip.patch;patch=1 \ 20 file://no-strip.patch;patch=1 \
21 file://fix-dirent.patch;patch=1" 21 file://fix-dirent.patch;patch=1 \
22 file://zlibsearch.patch;patch=1 "
22 23
23# file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 24# file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1
24 25