summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch')
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
new file mode 100644
index 0000000000..84c4d03731
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
@@ -0,0 +1,33 @@
1The Makefile used by shared-mime-info is one big race with the SUBDIRS
2option and the dependency specifically calling make all combining to
3create multiple make instances all of which may try and build targets
4like update-mime-database.
5
6This patch removes those options meaning make can correctly identify
7dependencies and stop itself racing itself.
8
9RP 10/10/2011
10
11Upstream-Status: Pending
12Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
13
14Index: shared-mime-info-1.0/Makefile.am
15===================================================================
16--- shared-mime-info-1.0.orig/Makefile.am
17+++ shared-mime-info-1.0/Makefile.am
18@@ -1,5 +1,3 @@
19-SUBDIRS=. po
20-
21 AM_CPPFLAGS = $(ALL_CFLAGS)
22
23 packagesdir = $(datadir)/mime/packages
24@@ -72,8 +70,7 @@ uninstall-hook:
25
26 all: $(defaultmakedeps)
27
28-create-pot:
29- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
30+create-pot: po
31
32 check: create-pot freedesktop.org.xml update-mime-database check-translations
33 if test -e $(top_builddir)/freedesktop.org.xml; then \