[OE-core] [PATCH] mesa: Fix parallel make race

[Khem Raj]

Thanks my builders have been constantly showing this failure

On Thu, Jun 28, 2018 at 6:42 AM Richard Purdie <
richard.purdie at linuxfoundation.org> wrote:

> Builds keep failing with a race over the generated header file, fix it!
>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> ---
>  .../mesa/files/parallel-make-race-fix.patch   | 26 +++++++++++++++++++
>  meta/recipes-graphics/mesa/mesa_18.1.2.bb     |  1 +
>  2 files changed, 27 insertions(+)
>  create mode 100644
> meta/recipes-graphics/mesa/files/parallel-make-race-fix.patch
>
> 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 00000000000..142279584e4
> --- /dev/null
> +++ b/meta/recipes-graphics/mesa/files/parallel-make-race-fix.patch
> @@ -0,0 +1,26 @@
> +There is a parallel make build issue in src/egl/drivers/dri2/
> +for wayland builds. Can be reproduced with:
> +
> +$ rm src/egl/drivers/dri2/*.h src/egl/drivers/dri2/platform_wayland.lo
> +$ make -C src/egl/ drivers/dri2/platform_wayland.lo
> +
> +../../../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
> +
> +This patch adds the missing dependency.
> +
> +Signed-off-by Richard Purdie <richard.purdie at linuxfoundation.org>
> +
> +Upstream-Status: Pending
> +
> +Index: mesa-18.1.2/src/egl/Makefile.am
> +===================================================================
> +--- mesa-18.1.2.orig/src/egl/Makefile.am
> ++++ mesa-18.1.2/src/egl/Makefile.am
> +@@ -80,6 +80,7 @@ drivers/dri2/linux-dmabuf-unstable-v1-cl
> + if HAVE_PLATFORM_WAYLAND
> + drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo:
> drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
> + drivers/dri2/egl_dri2.lo:
> drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
> ++drivers/dri2/platform_wayland.lo:
> drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
> +
> + AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS)
> + libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
> diff --git a/meta/recipes-graphics/mesa/mesa_18.1.2.bb
> b/meta/recipes-graphics/mesa/mesa_18.1.2.bb
> index 2c06b1eb7ba..9a9a2b25623 100644
> --- a/meta/recipes-graphics/mesa/mesa_18.1.2.bb
> +++ b/meta/recipes-graphics/mesa/mesa_18.1.2.bb
> @@ -8,6 +8,7 @@ SRC_URI = "
> https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
>
> file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
>             file://0006-Use-Python-3-to-execute-the-scripts.patch \
>             file://0007-dri-i965-Add-missing-time.h-include.patch \
> +           file://parallel-make-race-fix.patch \
>  "
>
>  SRC_URI[md5sum] = "a2d4f031eb6bd6111d44d84004476918"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180628/f3dd0f01/attachment-0002.html>