aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-05-09 20:44:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:00:28 +0100
commit5681ba2e403afb6cea03662a2aca6b1834567ddc (patch)
tree295635f30f246a322a3045eb6746b99c342cdc44 /meta/recipes-graphics/mesa/files
parent7ab51c619697ad64d69ecf77449c43fe59c3290c (diff)
downloadopenembedded-core-contrib-5681ba2e403afb6cea03662a2aca6b1834567ddc.tar.gz
mesa: fix a build race in src/intel/vulkan
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r--meta/recipes-graphics/mesa/files/vulkan-mkdir.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
new file mode 100644
index 0000000000..9922a55b40
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
@@ -0,0 +1,41 @@
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From 4854c72bc21486f81712c8693588f7af6c64cf93 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Wed, 9 May 2018 20:41:36 +0100
+Subject: [PATCH] src/intel/Makefile.vulkan.am: add missing MKDIR_GEN
+
+Out of tree builds can try to write into a directory that doesn't exist yet:
+
+| Traceback (most recent call last):
+| File "../../../mesa-18.0.2/src/intel/vulkan/anv_icd.py", line 46, in <module>
+| with open(args.out, 'w') as f:
+| IOError: [Errno 2] No such file or directory: 'vulkan/intel_icd.x86_64.json'
+| Makefile:4882: recipe for target 'vulkan/intel_icd.x86_64.json' failed
+
+Add missing MKDIR_GEN calls to solve this.
+---
+ 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 0bcbf0419c..4125cb205a 100644
+--- a/src/intel/Makefile.vulkan.am
++++ b/src/intel/Makefile.vulkan.am
+@@ -64,10 +64,12 @@ EXTRA_DIST += \
+ vulkan/TODO
+
+ vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
++ $(MKDIR_GEN)
+ $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
+ --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
+
+ vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py
++ $(MKDIR_GEN)
+ $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
+ --lib-path="${libdir}" --out $@
+
+--
+2.11.0
+