summaryrefslogtreecommitdiffstats
path: root/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
blob: fea34a55a25016ac829278225bd21fa31cdb61ce (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
The Makefile used by shared-mime-info is one big race with the SUBDIRS 
option and the dependency specifically calling make all combining to
create multiple make instances all of which may try and build targets
like update-mime-database.

This patch removes those options meaning make can correctly identify
dependencies and stop itself racing itself.

RP 10/10/2011

Upstream-Status: Pending
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>

Index: shared-mime-info-1.9/Makefile.am
===================================================================
--- shared-mime-info-1.9.orig/Makefile.am
+++ shared-mime-info-1.9/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS=. po
-
 AM_CPPFLAGS = $(ALL_CFLAGS)
 
 packagesdir = $(datadir)/mime/packages
@@ -81,8 +79,7 @@ endif
 
 all: $(defaultmakedeps)
 
-create-pot:
-	$(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
+create-pot: po
 
 local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT)
 if CROSS_COMPILING