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:27 +0100 |
| commit | 43e7f168c84128b5d48bbfde9d6c07f2fb656b00 (patch) | |
| tree | 0d045b68fd67d160b581fbfdf3c0f5212bceaf76 /meta | |
| parent | 895a0840e82ddfd05c4441b7f8f358e27e6cb38a (diff) | |
| download | openembedded-core-43e7f168c84128b5d48bbfde9d6c07f2fb656b00.tar.gz openembedded-core-43e7f168c84128b5d48bbfde9d6c07f2fb656b00.tar.bz2 openembedded-core-43e7f168c84128b5d48bbfde9d6c07f2fb656b00.zip | |
mesa: add missing elfutils dependency for r600 PACKAGECONFIG
Fixes the following configure error:
configure:23490: error: radeonsi and r600g require libelf when using LLVM
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -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" GALLIUMDRIVERS = "swrast" GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" -GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', '', ',${GALLIUMDRIVERS_LLVM33}', d)}" +GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" +GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" GALLIUMDRIVERS_append_x86-64 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" # 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 PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" MESA_LLVM_RELEASE ?= "3.3" -PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE}" +PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ + ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) |