summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-11-03 00:02:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-08 14:03:20 +0000
commit4b22009db58e0f48722f9d002efe329de5ef2e53 (patch)
treed639a061e32b6615dbbabd2e3ffc820e91939eda /meta/recipes-graphics/mesa
parentc173b349caf07a1ea8be04d2cb66fa3db849e8f9 (diff)
downloadpoky-4b22009db58e0f48722f9d002efe329de5ef2e53.tar.gz
mesa: fix a build race
(From OE-Core rev: df243fa624f3acf20abc7574909bd43db2ed9d12) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch31
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch b/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch
new file mode 100644
index 0000000000..a61e7b2160
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch
@@ -0,0 +1,31 @@
1From f148d4f1b5b13288b254ead07f1d008d997e2342 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 2 Nov 2020 23:23:53 +0100
4Subject: [PATCH] anv: fix a build race between generating a header and using
5 it
6
7anv_batch_chain.c includes genX_bits.h but doesn't ensure it gets
8generated first. This causes build failures, as observed here:
9https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1501/steps/8/logs/step2d
10
11Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7412]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 src/intel/vulkan/meson.build | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
18index 36e1689314e..b713d8eade3 100644
19--- a/src/intel/vulkan/meson.build
20+++ b/src/intel/vulkan/meson.build
21@@ -131,6 +131,7 @@ libanv_files = files(
22 anv_deps = [
23 dep_libdrm,
24 dep_valgrind,
25+ idep_genxml,
26 idep_nir_headers,
27 idep_vulkan_util_headers,
28 ]
29--
302.29.0
31
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 15f54c5acd..5a6caf2662 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -21,6 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
21 file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ 21 file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
22 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 22 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
23 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ 23 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
24 file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \
24 " 25 "
25 26
26SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a" 27SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a"