diff options
author | Joe Slater <jslater@windriver.com> | 2012-06-07 16:37:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-08 11:43:21 +0100 |
commit | 5094da32327fb6a6ef499bf99bd3e0f48cb77bc9 (patch) | |
tree | 9247d3555a2bab8433d97db7c95a730e50ee0883 /meta/recipes-support/shared-mime-info/shared-mime-info | |
parent | 3792f771289ee5ecbbe16c6671fbddf802ece337 (diff) | |
download | poky-5094da32327fb6a6ef499bf99bd3e0f48cb77bc9.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: 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>
Diffstat (limited to 'meta/recipes-support/shared-mime-info/shared-mime-info')
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch | 21 |
1 files changed, 21 insertions, 0 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 0000000000..4c075f2549 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | fix shared-mime-info build race condition | ||
2 | |||
3 | The definition of install-data-hook in Makefile.am leads | ||
4 | to multiple, overlapping, executions of install-binPROGRAMS | ||
5 | target. We modify the definition to avoid that. | ||
6 | |||
7 | Signed-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 | ||