mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
mesa: fix build race on src/intel/vulkan
It's possible that src/intel/vulkcan can be written into by sed before it has been created, so add the required mkdir calls. (From OE-Core rev: 19e793f65d214294baa9eeaf982f4ced351c7748) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
a46a9dd6bd
commit
f22dfe95cc
@@ -0,0 +1,37 @@
|
|||||||
|
Upstream-Status: Submitted
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
From c78979fd95a1c4f732f7e6edf0f32c524e5955b8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
|
Date: Wed, 12 Jul 2017 17:10:07 +0100
|
||||||
|
Subject: [PATCH] src/intel/Makefile.vulkan.am: create target directories when
|
||||||
|
required
|
||||||
|
|
||||||
|
In out-of-tree builds src/intel/vulkan won't exist, so always create it before
|
||||||
|
writing into it.
|
||||||
|
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
---
|
||||||
|
src/intel/Makefile.vulkan.am | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
|
||||||
|
index 3857a5dc62..26e9cd410c 100644
|
||||||
|
--- a/src/intel/Makefile.vulkan.am
|
||||||
|
+++ b/src/intel/Makefile.vulkan.am
|
||||||
|
@@ -44,11 +44,13 @@ EXTRA_DIST += \
|
||||||
|
vulkan/TODO
|
||||||
|
|
||||||
|
vulkan/dev_icd.json : vulkan/dev_icd.json.in
|
||||||
|
+ $(MKDIR_GEN)
|
||||||
|
$(AM_V_GEN) $(SED) \
|
||||||
|
-e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
|
||||||
|
< $(srcdir)/vulkan/dev_icd.json.in > $@
|
||||||
|
|
||||||
|
vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in
|
||||||
|
+ $(MKDIR_GEN)
|
||||||
|
$(AM_V_GEN) $(SED) \
|
||||||
|
-e "s#@install_libdir@#${libdir}#" \
|
||||||
|
< $(srcdir)/vulkan/intel_icd.json.in > $@
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
@@ -7,6 +7,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
|
|||||||
file://0001-Use-wayland-scanner-in-the-path.patch \
|
file://0001-Use-wayland-scanner-in-the-path.patch \
|
||||||
file://0002-hardware-gloat.patch \
|
file://0002-hardware-gloat.patch \
|
||||||
file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \
|
file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \
|
||||||
|
file://vulkan-mkdir.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"
|
SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"
|
||||||
|
|||||||
Reference in New Issue
Block a user