diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-12-24 17:59:38 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-26 18:37:59 +0000 |
| commit | f0ab1736438f6f23603e3694dc2f0b724b103722 (patch) | |
| tree | e1128d45bd8b95ee80a175b5bc4d26bf579e5077 | |
| parent | 7f0d417feae6efc7957c48ecc7e5b65f3fd8921b (diff) | |
| download | openembedded-core-contrib-f0ab1736438f6f23603e3694dc2f0b724b103722.tar.gz | |
tcmode-default.inc: set LLVMVERSION to a major version wildcard
There is no longer need to be specific: none of the recipes
using this variable in core need to know the particular version
of llvm exactly when using the default one set via PREFERRED_VERSION
from LLVMVERSION.
This as well enables automated version updates of llvm
for minor releases.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes-recipe/meson.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 3cc94c7584..48688bed75 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -72,7 +72,7 @@ strip = ${@meson_array('STRIP', d)} readelf = ${@meson_array('READELF', d)} objcopy = ${@meson_array('OBJCOPY', d)} pkgconfig = 'pkg-config' -llvm-config = 'llvm-config${LLVMVERSION}' +llvm-config = 'llvm-config' cups-config = 'cups-config' g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper' diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index dc1cac734f..c784221062 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -24,9 +24,7 @@ GLIBCVERSION ?= "2.36" LINUXLIBCVERSION ?= "5.19%" QEMUVERSION ?= "7.1%" GOVERSION ?= "1.19%" -# This can not use wildcards like 8.0.% since it is also used in mesa to denote -# llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "15.0.6" +LLVMVERSION ?= "15.%" RUSTVERSION ?= "1.66%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 115621228a..93b3b59a91 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -58,7 +58,7 @@ ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" -MESA_LLVM_RELEASE ?= "${LLVMVERSION}" +MESA_LLVM_RELEASE ?= "" # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' # by default the upstream mesa sources build a debug release |