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>
This commit is contained in:
Alexander Kanavin
2020-11-03 00:02:58 +01:00
committed by Richard Purdie
parent c173b349ca
commit 4b22009db5
2 changed files with 32 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
From f148d4f1b5b13288b254ead07f1d008d997e2342 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 2 Nov 2020 23:23:53 +0100
Subject: [PATCH] anv: fix a build race between generating a header and using
it
anv_batch_chain.c includes genX_bits.h but doesn't ensure it gets
generated first. This causes build failures, as observed here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1501/steps/8/logs/step2d
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7412]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
src/intel/vulkan/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 36e1689314e..b713d8eade3 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -131,6 +131,7 @@ libanv_files = files(
anv_deps = [
dep_libdrm,
dep_valgrind,
+ idep_genxml,
idep_nir_headers,
idep_vulkan_util_headers,
]
--
2.29.0

View File

@@ -21,6 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \
"
SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a"