We have a variable YOCTO_ALTERNATE_EXE_PATH to point to target sysroot, utilize this in mesa to use native version of llvm-config to report values from target sysroot.
Its in a way similar to --sysroot option Signed-off-by: Khem Raj <raj.k...@gmail.com> --- meta/recipes-devtools/llvm/llvm_git.bb | 12 +++++++----- meta/recipes-graphics/mesa/mesa.inc | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 5dcb508c23..5e754e45dc 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -87,12 +87,12 @@ do_compile() { } do_compile_class-native() { - NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE} llvm-tblgen + NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen } do_install() { NINJA_STATUS="[%p] " DESTDIR=${LLVM_INSTALL_DIR} ninja -v install - install -D -m 0755 ${B}/NATIVE/bin/llvm-config ${D}${libdir}/${LLVM_DIR}/llvm-config-host + install -D -m 0755 ${B}/bin/llvm-config ${D}${libdir}/${LLVM_DIR}/llvm-config install -d ${D}${bindir}/${LLVM_DIR} cp -r ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/ @@ -121,7 +121,9 @@ do_install() { rm -rf ${D}${libdir}/${LLVM_DIR}/libLTO.so } do_install_class-native() { - install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen + install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen-5.0 + install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config-5.0 + install -D -m 0755 ${B}/lib/libLLVM-5.0.so ${D}${libdir}/libLLVM-5.0.so } PACKAGES += "${PN}-bugpointpasses ${PN}-llvmhello" @@ -134,14 +136,14 @@ FILES_${PN}-dbg = " \ ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \ ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \ ${libdir}/${LLVM_DIR}/.debug/libLTO.so* \ - ${libdir}/${LLVM_DIR}/.debug/llvm-config-host \ + ${libdir}/${LLVM_DIR}/.debug/llvm-config \ /usr/src/debug \ " FILES_${PN}-dev = " \ ${bindir}/${LLVM_DIR} \ ${includedir}/${LLVM_DIR} \ - ${libdir}/${LLVM_DIR}/llvm-config-host \ + ${libdir}/${LLVM_DIR}/llvm-config \ " RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index c9b67d4966..b0f9410e36 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -25,8 +25,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)}" -export LLVM_CONFIG = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config-host" - +export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config-${MESA_LLVM_RELEASE}" +export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" EXTRA_OECONF = "--enable-shared-glapi \ --disable-opencl \ --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \ @@ -75,7 +75,7 @@ GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-l # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" MESA_LLVM_RELEASE ?= "5.0" -PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} \ +PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" -- 2.13.3 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core