summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/wayland/weston/parallelmake.patch38
1 files changed, 28 insertions, 10 deletions
diff --git a/meta/recipes-graphics/wayland/weston/parallelmake.patch b/meta/recipes-graphics/wayland/weston/parallelmake.patch
index 34d7512b9e..42b5efbc3a 100644
--- a/meta/recipes-graphics/wayland/weston/parallelmake.patch
+++ b/meta/recipes-graphics/wayland/weston/parallelmake.patch
@@ -1,15 +1,33 @@
1The current approach used by the Makefile ends up installing 1Backport two patches from upstream to fix parallel builds
2weston.desktop twice and can give build failures when using
3parallel make flags. Change to just have one DATA reference.
4 2
5RP 3- mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc)
62015/8/3 4- weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03)
7Upstream-Status: Pending
8 5
9Index: weston-1.8.0/Makefile.am 6Upstream-Status: Backport
10=================================================================== 7Signed-off-by: Ross Burton <ross.burton@intel.com>
11--- weston-1.8.0.orig/Makefile.am 8
12+++ weston-1.8.0/Makefile.am 9diff --git a/Makefile.am b/Makefile.am
10index 5819b19..ff13b19 100644
11--- a/Makefile.am
12+++ b/Makefile.am
13@@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in
14 $< > $@
15
16 ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
17- $(AM_V_GEN)$(SED) \
18+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
19 -e 's|@bindir[@]|$(bindir)|g' \
20 -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
21 -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
22@@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
23 $< > $@
24
25 tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
26- $(AM_V_GEN)$(SED) \
27+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
28 -e 's|@bindir[@]|$(bindir)|g' \
29 -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
30 -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
13@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig 31@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig
14 pkgconfig_DATA = src/weston.pc 32 pkgconfig_DATA = src/weston.pc
15 33