[oe-commits] [openembedded-core] 31/39: mesa.inc: drop wrong path in --with-llvm-prefix and export LLVM_CONFIG

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

commit 24f66a4e7a7fff915742d6cea26d2686f3147b19
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Sat Aug 12 02:34:55 2017 +0200

    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 at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-graphics/mesa/mesa.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 0348bb2..25cbf63 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
 
 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)} \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.