mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

weston: Fix parallel make race

Browse Source 
The current approach used by the Makefile ends up installing
weston.desktop twice and can give build failures when using
parallel make flags. Change to just have one DATA reference.

(From OE-Core rev: 5191ab6962712908e1aa1dca0d4253fb278366c2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-08-03 17:47:31 +01:00
parent 8b847ffd04
commit ecec4af302
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/wayland/weston/parallelmake.patch
+22
View File
@@ -0,0 +1,22 @@
The current approach used by the Makefile ends up installing
weston.desktop twice and can give build failures when using
parallel make flags. Change to just have one DATA reference.
RP
2015/8/3
Upstream-Status: Pending
Index: weston-1.8.0/Makefile.am
===================================================================
--- weston-1.8.0.orig/Makefile.am
+++ weston-1.8.0/Makefile.am
@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = src/weston.pc
wayland_sessiondir = $(datadir)/wayland-sessions
-wayland_session_DATA = src/weston.desktop
-dist_wayland_session_DATA = $(wayland_session_DATA)
+dist_wayland_session_DATA = src/weston.desktop
westonincludedir = $(includedir)/weston
westoninclude_HEADERS = \
meta/recipes-graphics/wayland/weston_1.8.0.bb
+1
View File
@@ -11,6 +11,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://make-lcms-explicitly-configurable.patch \
file://make-libwebp-explicitly-configurable.patch \
file://0001-make-error-portable.patch \
file://parallelmake.patch \
"
SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"