summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-03 17:47:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-09 00:13:57 -0700
commitecec4af3021b1fe0bac7b441f4e0364ce1a4d251 (patch)
tree0d6e93fa6751c74e7c09bf8188882d00f8dcb7b1 /meta/recipes-graphics/wayland
parent8b847ffd040fc35d246079eb0b8d51331dc721b5 (diff)
downloadpoky-ecec4af3021b1fe0bac7b441f4e0364ce1a4d251.tar.gz
weston: Fix parallel make race
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>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/weston/parallelmake.patch22
-rw-r--r--meta/recipes-graphics/wayland/weston_1.8.0.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston/parallelmake.patch b/meta/recipes-graphics/wayland/weston/parallelmake.patch
new file mode 100644
index 0000000000..34d7512b9e
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/parallelmake.patch
@@ -0,0 +1,22 @@
1The current approach used by the Makefile ends up installing
2weston.desktop twice and can give build failures when using
3parallel make flags. Change to just have one DATA reference.
4
5RP
62015/8/3
7Upstream-Status: Pending
8
9Index: weston-1.8.0/Makefile.am
10===================================================================
11--- weston-1.8.0.orig/Makefile.am
12+++ weston-1.8.0/Makefile.am
13@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig
14 pkgconfig_DATA = src/weston.pc
15
16 wayland_sessiondir = $(datadir)/wayland-sessions
17-wayland_session_DATA = src/weston.desktop
18-dist_wayland_session_DATA = $(wayland_session_DATA)
19+dist_wayland_session_DATA = src/weston.desktop
20
21 westonincludedir = $(includedir)/weston
22 westoninclude_HEADERS = \
diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb
index ac6bd9784b..342c604b98 100644
--- a/meta/recipes-graphics/wayland/weston_1.8.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -11,6 +11,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
11 file://make-lcms-explicitly-configurable.patch \ 11 file://make-lcms-explicitly-configurable.patch \
12 file://make-libwebp-explicitly-configurable.patch \ 12 file://make-libwebp-explicitly-configurable.patch \
13 file://0001-make-error-portable.patch \ 13 file://0001-make-error-portable.patch \
14 file://parallelmake.patch \
14" 15"
15SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36" 16SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
16SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312" 17SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"