mesa: fix a build race in src/intel/vulkan

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch
new file mode 100644 (file)
index 0000000..9922a55
--- /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
+

diff --git a/meta/recipes-graphics/mesa/mesa_18.0.2.bb b/meta/recipes-graphics/mesa/mesa_18.0.2.bb
index aaac1e58e12ba6cf356ea918982d79604b6dd912..f2ac38e919a734a0d90fb9589e9c1cf7932daf71 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa_18.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.0.2.bb
@@ -8,6 +8,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://llvm-config-version.patch \
            file://0001-winsys-svga-drm-Include-sys-types.h.patch \
            file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
+           file://vulkan-mkdir.patch \
            "
 
 SRC_URI[md5sum] = "3c303da98ec2ce37c795baeba5aee31e"