diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-08-10 20:32:57 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:28:48 -0700 |
| commit | 3b7a062472587bc2440e9980f673392dc39111b1 (patch) | |
| tree | 6167db513983d68f0a6a44fa9dadfb02ac340c99 /meta/recipes-graphics/wayland/weston | |
| parent | a8804b18994942bbfd21f7874bc47824788ad07e (diff) | |
| download | poky-3b7a062472587bc2440e9980f673392dc39111b1.tar.gz | |
weston: improve parallel make race fixes
The original fix is upstream already so mark as a backport, and update the patch
with another race fix.
(From OE-Core rev: ab9d3c4e2bfb68d3a67a85d5a8e799216103978a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston')
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/parallelmake.patch | 38 |
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 @@ | |||
| 1 | The current approach used by the Makefile ends up installing | 1 | Backport two patches from upstream to fix parallel builds |
| 2 | weston.desktop twice and can give build failures when using | ||
| 3 | parallel make flags. Change to just have one DATA reference. | ||
| 4 | 2 | ||
| 5 | RP | 3 | - mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc) |
| 6 | 2015/8/3 | 4 | - weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03) |
| 7 | Upstream-Status: Pending | ||
| 8 | 5 | ||
| 9 | Index: weston-1.8.0/Makefile.am | 6 | Upstream-Status: Backport |
| 10 | =================================================================== | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 11 | --- weston-1.8.0.orig/Makefile.am | 8 | |
| 12 | +++ weston-1.8.0/Makefile.am | 9 | diff --git a/Makefile.am b/Makefile.am |
| 10 | index 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 | ||