summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2012-06-07 23:37:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-14 10:23:49 (GMT)
commitbfc8589048ac5c3c1e02c6d518e07164de6f5ac9 (patch)
tree006579a6852c8d37e3b023f6844624a6bee25715 /meta/recipes-support
parent6514e193ac59f75c484066d11727d66a7466b55d (diff)
downloadpoky-bfc8589048ac5c3c1e02c6d518e07164de6f5ac9.tar.gz
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: d8a09cb17f2f3b43718ba354da7368a2ed793766) 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>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch21
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb5
2 files changed, 24 insertions, 2 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
new file mode 100644
index 0000000..4c075f2
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
@@ -0,0 +1,21 @@
1fix shared-mime-info build race condition
2
3The definition of install-data-hook in Makefile.am leads
4to multiple, overlapping, executions of install-binPROGRAMS
5target. We modify the definition to avoid that.
6
7Signed-off-by: Joe Slater <jslater@windriver.com>
8
9--- a/Makefile.am
10+++ b/Makefile.am
11@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status
12 @INTLTOOL_XML_RULE@
13 @INTLTOOL_DESKTOP_RULE@
14
15-install-data-hook: install-binPROGRAMS
16+# do NOT make this dependent on anything!
17+#
18+install-data-hook:
19 if ENABLE_UPDATE_MIMEDB
20 $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
21 endif
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
index 7ae6e10..910cb7f 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
@@ -1,7 +1,8 @@
1require shared-mime-info.inc 1require shared-mime-info.inc
2PR = "r3" 2PR = "r4"
3 3
4SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc" 4SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
5SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd" 5SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
6 6
7SRC_URI =+ "file://parallelmake.patch" 7SRC_URI =+ "file://parallelmake.patch \
8 file://install-data-hook.patch"