summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-10 21:53:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:38 +0100
commit7dfb9ce398a4ca62d2d53be9ddc7128e665d5126 (patch)
tree64a1e510cad819be262b68e3f612e0fa49ab6b8d
parent8262a89410cf2e8b303da77dd850e6ac11650517 (diff)
downloadpoky-7dfb9ce398a4ca62d2d53be9ddc7128e665d5126.tar.gz
shared-mime-info: Fix a parallel make race
(From OE-Core rev: 486b17af3e4cced76e9852e7634f75ea87433db2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch32
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb3
2 files changed, 34 insertions, 1 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..9e86a71795
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
@@ -0,0 +1,32 @@
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
12
13Index: shared-mime-info-0.91/Makefile.am
14===================================================================
15--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100
16+++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100
17@@ -1,5 +1,3 @@
18-SUBDIRS=. po
19-
20 INCLUDES = $(ALL_CFLAGS)
21
22 packagesdir = $(datadir)/mime/packages
23@@ -70,8 +68,7 @@
24
25 all: check create-pot
26
27-create-pot:
28- $(MAKE) -C po shared-mime-info.pot
29+create-pot: po
30
31 check: create-pot freedesktop.org.xml update-mime-database check-translations
32 if test -e $(top_builddir)/freedesktop.org.xml; then \
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 76d27563a3..0c3b01cb9d 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,6 +1,7 @@
1require shared-mime-info.inc 1require shared-mime-info.inc
2PR = "r0" 2PR = "r1"
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"