summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-08-28 11:08:14 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-30 17:06:31 (GMT)
commit09d176167028c11c36373289f7cecdbfb61ed2e2 (patch)
tree7c3a9fb2a31eeb2db3235f11c9ed7e6bcff211b7 /meta
parent2163807010e0400540c7751c71704bd7240d3f51 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index e985d67..71fcabd 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
52GALLIUMDRIVERS = "swrast" 52GALLIUMDRIVERS = "swrast"
53GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" 53GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}"
54GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', '', ',${GALLIUMDRIVERS_LLVM33}', d)}" 54GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
55GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
55GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 56GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
56GALLIUMDRIVERS_append_x86-64 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 57GALLIUMDRIVERS_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
59PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" 60PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl"
60PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" 61PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm"
61MESA_LLVM_RELEASE ?= "3.3" 62MESA_LLVM_RELEASE ?= "3.3"
62PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE}" 63PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \
64 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
63export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" 65export 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)