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"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 0348bb2dbbf331a8f10bae9341fa5a014191867d..25cbf631a749aff8e77b177356a1512f183866a5 100644 (file)
--- 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
 
 REQUIRED_DISTRO_FEATURES = "opengl"
 
-EXTRA_OECONF = "--enable-shared-glapi --with-llvm-prefix=${STAGING_BINDIR_NATIVE}"
+export LLVM_CONFIG = "${STAGING_BINDIR_CROSS}/llvm-config"
+EXTRA_OECONF = "--enable-shared-glapi"
 
 PACKAGECONFIG ??= "gbm egl gles dri \
                ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \