From e893a70e12361c57d53c1c7edd41ffb085553fd2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 1 Jun 2025 22:45:29 +0200 Subject: [PATCH] package/mesa3d: vulkan intel needs llvm Since mesa3d was bumped to 25.0.6 with buildroot commit 317260f336 the Intel Vulkan driver also needs llvm. Reported-by: Heiko Thiery https://lists.buildroot.org/pipermail/buildroot/2025-May/780130.html Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/mesa3d/Config.in | 10 +++++++++- package/mesa3d/mesa3d.mk | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 9454beedf4..98c77125e1 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -51,7 +51,8 @@ config BR2_PACKAGE_MESA3D_OPENCL depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS || \ + BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL select BR2_PACKAGE_LLVM_RTTI select BR2_PACKAGE_CLANG select BR2_PACKAGE_LIBCLC @@ -324,10 +325,17 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert + depends on BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_OPENCL select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + select BR2_PACKAGE_SPIRV_TOOLS help Vulkan driver for Intel hardware from Ivy Bridge onward. +comment "intel vulkan needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 84d1aae6ef..bc456a43a3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -133,6 +133,8 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y) MESA3D_DEPENDENCIES += host-python-ply +MESA3D_CONF_OPTS += -Dmesa-clc=system -Dprecomp-compiler=system +MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools endif ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y)