diff options
-rw-r--r-- | meta/recipes-devtools/llvm/llvm_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 71bc1a022a..a49965668f 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
@@ -14,8 +14,6 @@ RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" | |||
14 | 14 | ||
15 | inherit cmake pkgconfig | 15 | inherit cmake pkgconfig |
16 | 16 | ||
17 | PROVIDES += "llvm${PV}" | ||
18 | |||
19 | PV = "16.0.3" | 17 | PV = "16.0.3" |
20 | 18 | ||
21 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" | 19 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" |
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 10efff96f0..439389fb8a 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -52,8 +52,6 @@ ANY_OF_DISTRO_FEATURES = "opengl vulkan" | |||
52 | 52 | ||
53 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" | 53 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" |
54 | 54 | ||
55 | MESA_LLVM_RELEASE ?= "" | ||
56 | |||
57 | # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' | 55 | # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' |
58 | # by default the upstream mesa sources build a debug release | 56 | # by default the upstream mesa sources build a debug release |
59 | # here we assume the user will want a release build by default | 57 | # here we assume the user will want a release build by default |
@@ -178,8 +176,7 @@ GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', | |||
178 | GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" | 176 | GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" |
179 | 177 | ||
180 | PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm" | 178 | PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm" |
181 | PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm${MESA_LLVM_RELEASE} llvm-native \ | 179 | PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm llvm-native elfutils" |
182 | elfutils" | ||
183 | PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled" | 180 | PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled" |
184 | PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial" | 181 | PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial" |
185 | 182 | ||