diff options
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch | 42 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch b/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch new file mode 100644 index 0000000000..4cded0546d --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 00d41cd5aa3f4b494dc276c9b4ccdc096310c91f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 28 Sep 2023 15:34:22 -0700 | ||
4 | Subject: [PATCH] meson: use llvm-config instead of cmake to fix linking errors with meson 1.2.1 | ||
5 | |||
6 | meson dependency auto dependency detection uses cmake and then | ||
7 | config-tool to process dependencies, in mesa the logic to detect llvm is | ||
8 | using auto detection which means if it finds cmake then it will try to | ||
9 | use cmake method. Cmake method works ok except a case when llvm-dev | ||
10 | package is installed on the build host then it generates its own | ||
11 | native.meson file and ignores OE supplied meson.native file which has | ||
12 | correct llvm-config tool specified which is pointing to llvm-config from | ||
13 | native sysroot. The generated meson.native file points to one found in | ||
14 | /usr/bin and there onwards detector finds native install of llvm and | ||
15 | configures that into building native mesa package. | ||
16 | |||
17 | Since cmake detector does not always work, disable it by default and use | ||
18 | config-tool which works in all cases. This is suggested in below issues | ||
19 | too | ||
20 | |||
21 | A similar issue is open in meson upstream [1] and mesa [2] | ||
22 | |||
23 | [1] https://github.com/mesonbuild/meson/issues/10483 | ||
24 | [2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/6738 | ||
25 | |||
26 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25438] | ||
27 | |||
28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
29 | --- | ||
30 | meson.build | 1 + | ||
31 | 1 file changed, 1 insertion(+) | ||
32 | |||
33 | --- a/meson.build | ||
34 | +++ b/meson.build | ||
35 | @@ -1659,6 +1659,7 @@ with_llvm = false | ||
36 | if _llvm.allowed() | ||
37 | dep_llvm = dependency( | ||
38 | 'llvm', | ||
39 | + method : host_machine.system() == 'windows' ? 'auto' : 'config-tool', | ||
40 | version : _llvm_version, | ||
41 | modules : llvm_modules, | ||
42 | optional_modules : llvm_optional_modules, | ||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 559d445ae5..4e824500dd 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -19,6 +19,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
20 | file://0001-gallium-Fix-build-with-llvm-17.patch \ | 20 | file://0001-gallium-Fix-build-with-llvm-17.patch \ |
21 | file://0001-intel-Allow-using-intel_clc-from-the-system.patch \ | 21 | file://0001-intel-Allow-using-intel_clc-from-the-system.patch \ |
22 | file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[sha256sum] = "45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad" | 25 | SRC_URI[sha256sum] = "45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad" |