summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-28 13:39:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-29 11:07:44 +0100
commitd2d84b1f96dbf4ce4f47e31fb93a57cca9094213 (patch)
treed6c3db4ee3ab72b60f414d5cec327ded9ca71ebc /meta/recipes-graphics/mesa/files
parentf15587a6f47daeddcb277bcbad6c3f45cb2728dd (diff)
downloadpoky-d2d84b1f96dbf4ce4f47e31fb93a57cca9094213.tar.gz
mesa: Fix parallel make race
Builds keep failing with a race over the generated header file, fix it! [YOCTO #12828] (From OE-Core rev: 3db0b1e798797013e3c553c1ce599191da2c3daa) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r--meta/recipes-graphics/mesa/files/parallel-make-race-fix.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/parallel-make-race-fix.patch b/meta/recipes-graphics/mesa/files/parallel-make-race-fix.patch
new file mode 100644
index 0000000000..d212a55cbb
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/parallel-make-race-fix.patch
@@ -0,0 +1,26 @@
1There is a parallel make build issue in src/egl/drivers/dri2/
2for wayland builds. Can be reproduced with:
3
4$ rm src/egl/drivers/dri2/*.h src/egl/drivers/dri2/platform_wayland.lo
5$ make -C src/egl/ drivers/dri2/platform_wayland.lo
6
7../../../mesa-18.1.2/src/egl/drivers/dri2/platform_wayland.c:50:10: fatal error: linux-dmabuf-unstable-v1-client-protocol.h: No such file or directory
8
9This patch adds the missing dependency.
10
11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12
13Upstream-Status: Submitted (https://lists.freedesktop.org/archives/mesa-dev/2018-June/198889.html)
14
15Index: mesa-18.1.2/src/egl/Makefile.am
16===================================================================
17--- mesa-18.1.2.orig/src/egl/Makefile.am
18+++ mesa-18.1.2/src/egl/Makefile.am
19@@ -80,6 +80,7 @@ drivers/dri2/linux-dmabuf-unstable-v1-cl
20 if HAVE_PLATFORM_WAYLAND
21 drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
22 drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
23+drivers/dri2/platform_wayland.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
24
25 AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS)
26 libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS)