summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-04 16:34:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:49:08 +0100
commit9ed34e315a8d2db58e212b0770dfa8f4ad00f637 (patch)
treea6a2b253d0a530cf6f285b7dfe458b607ec7396f
parent4880d0f9c808fd50f3eba0d87a804b4dce1334fa (diff)
downloadpoky-9ed34e315a8d2db58e212b0770dfa8f4ad00f637.tar.gz
mesa: Update to use llvm 6.0
Adpat to the upgrade from 5.0 -> 6.0. (From OE-Core rev: dc52f9cf343df4c2d77bee0e47004466321e7edb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 639eb35f6b..b501b7e726 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -89,7 +89,7 @@ GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm
89GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 89GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
90# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers 90# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
91PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" 91PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
92MESA_LLVM_RELEASE ?= "5.0" 92MESA_LLVM_RELEASE ?= "6.0"
93PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \ 93PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
94 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 94 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
95export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" 95export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"