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>
This commit is contained in:
parent
a8804b1899
commit
3b7a062472
|
@ -1,15 +1,33 @@
|
|||
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.
|
||||
Backport two patches from upstream to fix parallel builds
|
||||
|
||||
RP
|
||||
2015/8/3
|
||||
Upstream-Status: Pending
|
||||
- mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc)
|
||||
- weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03)
|
||||
|
||||
Index: weston-1.8.0/Makefile.am
|
||||
===================================================================
|
||||
--- weston-1.8.0.orig/Makefile.am
|
||||
+++ weston-1.8.0/Makefile.am
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 5819b19..ff13b19 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in
|
||||
$< > $@
|
||||
|
||||
ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
|
||||
- $(AM_V_GEN)$(SED) \
|
||||
+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
|
||||
-e 's|@bindir[@]|$(bindir)|g' \
|
||||
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
|
||||
-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
|
||||
@@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
|
||||
$< > $@
|
||||
|
||||
tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
|
||||
- $(AM_V_GEN)$(SED) \
|
||||
+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
|
||||
-e 's|@bindir[@]|$(bindir)|g' \
|
||||
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
|
||||
-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
|
||||
@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = src/weston.pc
|
||||
|
||||
|
|
Loading…
Reference in New Issue