diff options
-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)} | |||
72 | readelf = ${@meson_array('READELF', d)} | 72 | readelf = ${@meson_array('READELF', d)} |
73 | objcopy = ${@meson_array('OBJCOPY', d)} | 73 | objcopy = ${@meson_array('OBJCOPY', d)} |
74 | pkgconfig = 'pkg-config' | 74 | pkgconfig = 'pkg-config' |
75 | llvm-config = 'llvm-config${LLVMVERSION}' | 75 | llvm-config = 'llvm-config' |
76 | cups-config = 'cups-config' | 76 | cups-config = 'cups-config' |
77 | g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' | 77 | g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' |
78 | g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper' | 78 | 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" | |||
24 | LINUXLIBCVERSION ?= "5.19%" | 24 | LINUXLIBCVERSION ?= "5.19%" |
25 | QEMUVERSION ?= "7.1%" | 25 | QEMUVERSION ?= "7.1%" |
26 | GOVERSION ?= "1.19%" | 26 | GOVERSION ?= "1.19%" |
27 | # This can not use wildcards like 8.0.% since it is also used in mesa to denote | 27 | LLVMVERSION ?= "15.%" |
28 | # llvm version being used, so always bump it with llvm recipe version bump | ||
29 | LLVMVERSION ?= "15.0.6" | ||
30 | RUSTVERSION ?= "1.66%" | 28 | RUSTVERSION ?= "1.66%" |
31 | 29 | ||
32 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | 30 | 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" | |||
58 | 58 | ||
59 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" | 59 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" |
60 | 60 | ||
61 | MESA_LLVM_RELEASE ?= "${LLVMVERSION}" | 61 | MESA_LLVM_RELEASE ?= "" |
62 | 62 | ||
63 | # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' | 63 | # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' |
64 | # by default the upstream mesa sources build a debug release | 64 | # by default the upstream mesa sources build a debug release |