summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-07-31 10:48:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-08 10:19:56 +0100
commit4df4352813c76ef75ab7c85e40d2b5ec2e8535ec (patch)
treee0de09a7bcacc826ca68e70e921f49f013936ef7 /meta/recipes-graphics
parent3ef77a577c8dcbf9ac3718a3bc114767ab55a71a (diff)
downloadpoky-4df4352813c76ef75ab7c85e40d2b5ec2e8535ec.tar.gz
mesa,llvm,meson: Update llvm to 8.0.1 plus define and use LLVM version globally
- Add missing dependency on libedit - Define LLVMVERSION on the same lines as GCCVERSION and other tools - Use LLVMVERSION in mesa and meson.bbclass to get llvm version instead of hardcoding it - Use llvm patches unmodified from meta-clang, helps in keeping them in sync - Define PREFERRED_VERSION for llvm, llvm-native, nativesdk-llvm (From OE-Core rev: 3c08b638348abd543fc92baf56c28ca16ae6aac6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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 5bbd13bca2..e99eb39d26 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -36,6 +36,10 @@ PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \
36 36
37export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" 37export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
38export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" 38export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
39export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
40export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
41
42MESA_LLVM_RELEASE ?= "${LLVMVERSION}"
39 43
40EXTRA_OEMESON = " \ 44EXTRA_OEMESON = " \
41 -Dshared-glapi=true \ 45 -Dshared-glapi=true \
@@ -107,10 +111,8 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600',
107GALLIUMDRIVERS_append = ",virgl" 111GALLIUMDRIVERS_append = ",virgl"
108 112
109PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers=''" 113PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers=''"
110MESA_LLVM_RELEASE ?= "8.0.0"
111PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ 114PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \
112 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 115 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
113export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
114PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" 116PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false"
115 117
116PACKAGECONFIG[lima] = "" 118PACKAGECONFIG[lima] = ""