summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/shared-mime-info
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:06:56 +0100
commit486b17af3e4cced76e9852e7634f75ea87433db2 (patch)
tree93f6585c39b2f87fc107af41edd8d2d66f35632f /meta/recipes-support/shared-mime-info
parent467f54ccf2409700600811b844d470bfb0720c01 (diff)
downloadopenembedded-core-486b17af3e4cced76e9852e7634f75ea87433db2.tar.gz
openembedded-core-486b17af3e4cced76e9852e7634f75ea87433db2.tar.bz2
openembedded-core-486b17af3e4cced76e9852e7634f75ea87433db2.zip
shared-mime-info: Fix a parallel make race
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/shared-mime-info')
-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 @@
+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
+
+Index: shared-mime-info-0.91/Makefile.am
+===================================================================
+--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100
++++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100
+@@ -1,5 +1,3 @@
+-SUBDIRS=. po
+-
+ INCLUDES = $(ALL_CFLAGS)
+
+ packagesdir = $(datadir)/mime/packages
+@@ -70,8 +68,7 @@
+
+ all: check create-pot
+
+-create-pot:
+- $(MAKE) -C po shared-mime-info.pot
++create-pot: po
+
+ check: create-pot freedesktop.org.xml update-mime-database check-translations
+ 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 @@
require shared-mime-info.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
+SRC_URI =+ "file://parallelmake.patch"