summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-04-15 15:41:44 +0100
committerJoshua Lock <josh@linux.intel.com>2010-04-15 17:49:49 +0100
commit36652f51abc8e2e28b51f06386e00e491c1590a5 (patch)
tree3c2cac50cb8f772115fe6e7224c5579a670c2fcf
parentd3fbb56c2ffa44e2da15ca4bfa4def35792ab6f7 (diff)
downloadpoky-36652f51abc8e2e28b51f06386e00e491c1590a5.tar.gz
qemu_git: Ensure we have the required dependencies for a native build
qemu-native requires a libGL and the SDL development headers to build with our GL "emulation". This patch adds a check before configure for the native package to ensure that the sdl.pc file and GL so files exist and bombs out otherwise. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/packages/qemu/qemu_git.bb19
1 files changed, 18 insertions, 1 deletions
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/packages/qemu/qemu_git.bb
index 98fdc7c7d5..e9129649a8 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.6+git${SRCREV}" 3PV = "0.10.6+git${SRCREV}"
4PR = "r2" 4PR = "r3"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" 6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
7 7
@@ -23,6 +23,23 @@ EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-sof
23 23
24inherit autotools 24inherit autotools
25 25
26# For our gl powered QEMU you need libGL and SDL headers
27do_configure_prepend_virtclass-native() {
28 libgl='no'
29 libsdl='no'
30
31 test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
32 test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
33
34 test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc && libsdl='yes'
35
36 if [ "$libsdl" != 'yes' -o "$libgl" != 'yes' ]; then
37 echo "You need libGL.so and libGLU.so to exist in your library path and the development headers for SDL installed to build qemu-native.
38 Ubuntu package names are: libgl1-mesa-dev, libglu1-mesa-dev and libsdl1.2-dev"
39 exit 1;
40 fi
41}
42
26do_configure() { 43do_configure() {
27 ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} 44 ${S}/configure --prefix=${prefix} ${EXTRA_OECONF}
28 chmod a+x ${S}/target-i386/beginend_funcs.sh 45 chmod a+x ${S}/target-i386/beginend_funcs.sh