diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-08-28 21:08:14 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-30 18:06:31 +0100 |
| commit | 09d176167028c11c36373289f7cecdbfb61ed2e2 (patch) | |
| tree | 7c3a9fb2a31eeb2db3235f11c9ed7e6bcff211b7 /meta/recipes-graphics/mesa/mesa.inc | |
| parent | 2163807010e0400540c7751c71704bd7240d3f51 (diff) | |
| download | poky-09d176167028c11c36373289f7cecdbfb61ed2e2.tar.gz | |
mesa: add missing elfutils dependency for r600 PACKAGECONFIG
Fixes the following configure error:
configure:23490: error: radeonsi and r600g require libelf when using LLVM
(From OE-Core rev: 43e7f168c84128b5d48bbfde9d6c07f2fb656b00)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa.inc')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e985d675c0..71fcabd7fa 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
| @@ -51,7 +51,8 @@ PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" | |||
| 51 | 51 | ||
| 52 | GALLIUMDRIVERS = "swrast" | 52 | GALLIUMDRIVERS = "swrast" |
| 53 | GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" | 53 | GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" |
| 54 | GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', '', ',${GALLIUMDRIVERS_LLVM33}', d)}" | 54 | GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" |
| 55 | GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | ||
| 55 | GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" | 56 | GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" |
| 56 | GALLIUMDRIVERS_append_x86-64 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" | 57 | GALLIUMDRIVERS_append_x86-64 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" |
| 57 | # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers | 58 | # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers |
| @@ -59,7 +60,8 @@ PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --witho | |||
| 59 | PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" | 60 | PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" |
| 60 | PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" | 61 | PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" |
| 61 | MESA_LLVM_RELEASE ?= "3.3" | 62 | MESA_LLVM_RELEASE ?= "3.3" |
| 62 | PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE}" | 63 | PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ |
| 64 | ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | ||
| 63 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" | 65 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" |
| 64 | 66 | ||
| 65 | # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) | 67 | # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) |