shared-mime-info: fix build race condition
The definition of install-data-hook in Makefile.am leads to multiple, overlapping, executions of the install-binPROGRAMS target. We modify the definition to avoid that. (From OE-Core rev: 6fef8f73143fdeed6da15444c11bce9a8b35668b) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3792f77128
commit
5094da3232
|
@ -0,0 +1,21 @@
|
||||||
|
fix shared-mime-info build race condition
|
||||||
|
|
||||||
|
The definition of install-data-hook in Makefile.am leads
|
||||||
|
to multiple, overlapping, executions of install-binPROGRAMS
|
||||||
|
target. We modify the definition to avoid that.
|
||||||
|
|
||||||
|
Signed-off-by: Joe Slater <jslater@windriver.com>
|
||||||
|
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status
|
||||||
|
@INTLTOOL_XML_RULE@
|
||||||
|
@INTLTOOL_DESKTOP_RULE@
|
||||||
|
|
||||||
|
-install-data-hook: install-binPROGRAMS
|
||||||
|
+# do NOT make this dependent on anything!
|
||||||
|
+#
|
||||||
|
+install-data-hook:
|
||||||
|
if ENABLE_UPDATE_MIMEDB
|
||||||
|
$(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
|
||||||
|
endif
|
|
@ -1,7 +1,8 @@
|
||||||
require shared-mime-info.inc
|
require shared-mime-info.inc
|
||||||
PR = "r3"
|
PR = "r4"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
|
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
|
||||||
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
|
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
|
||||||
|
|
||||||
SRC_URI =+ "file://parallelmake.patch"
|
SRC_URI =+ "file://parallelmake.patch \
|
||||||
|
file://install-data-hook.patch"
|
||||||
|
|
Loading…
Reference in New Issue