summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-08-12 02:34:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 11:57:29 +0100
commit5a20323f2076b74e82f168f691f942df4b9bf93a (patch)
treebb9499e77910bd3c23099ad3c88a88965280a5b2 /meta
parentb4ea7bfad69ff8aaab76a3b6c282325a617b4841 (diff)
downloadpoky-5a20323f2076b74e82f168f691f942df4b9bf93a.tar.gz
mesa.inc: drop wrong path in --with-llvm-prefix and export LLVM_CONFIG
* this was added in oe-core/pyro but breaks all builds with llvm from meta-oe as reported in: http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135050.html * fix it by partial backport from master: http://git.openembedded.org/openembedded-core/commit/?id=da29bc17e4dd748f50b054c5e3afaf8d41bf4077 but with different path as llvm-3.3 from meta-oe installs llvm-config in: ${STAGING_BINDIR_CROSS}/llvm-config while llvm-5.0 from oe-core master (rocko) in: ${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config-host" (From OE-Core rev: 24f66a4e7a7fff915742d6cea26d2686f3147b19) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 0348bb2dbb..25cbf631a7 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -22,7 +22,8 @@ inherit autotools pkgconfig pythonnative gettext distro_features_check
22 22
23REQUIRED_DISTRO_FEATURES = "opengl" 23REQUIRED_DISTRO_FEATURES = "opengl"
24 24
25EXTRA_OECONF = "--enable-shared-glapi --with-llvm-prefix=${STAGING_BINDIR_NATIVE}" 25export LLVM_CONFIG = "${STAGING_BINDIR_CROSS}/llvm-config"
26EXTRA_OECONF = "--enable-shared-glapi"
26 27
27PACKAGECONFIG ??= "gbm egl gles dri \ 28PACKAGECONFIG ??= "gbm egl gles dri \
28 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ 29 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \