summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/shared-mime-info
diff options
context:
space:
mode:
authorKhem Raj <kraj@juniper.net>2011-05-25 15:56:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-27 16:55:04 +0100
commitb56d984d59b5ea682f115b8ceeb04fbffe01f13c (patch)
treed7467396e7f9f624eb1ab1d4b8a7eb49b988e3d3 /meta/recipes-support/shared-mime-info
parent77f93a2e1868a50d8d39d3efe621c530af32b450 (diff)
downloadopenembedded-core-b56d984d59b5ea682f115b8ceeb04fbffe01f13c.tar.gz
openembedded-core-b56d984d59b5ea682f115b8ceeb04fbffe01f13c.tar.bz2
openembedded-core-b56d984d59b5ea682f115b8ceeb04fbffe01f13c.zip
shared-mime-info_0.90.bb: Fix more parallel build issues
While building for beagleboard with -j4 I ended up failures in generating and checking xml files. This is a backport from upstream that fixes the issue. Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-support/shared-mime-info')
-rw-r--r--meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch26
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb5
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch b/meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch
new file mode 100644
index 0000000000..a78e6a8de6
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch
@@ -0,0 +1,26 @@
+Backport fix for https://bugs.freedesktop.org/show_bug.cgi?id=32127
+
+Upstream-Status: Inappropriate [Backport]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+From 68e31f61f5e50e5222bc05437d1123e932922796 Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <ssuominen@gentoo.org>
+Date: Mon, 06 Dec 2010 19:46:57 +0000
+Subject: Fix parallel build
+
+https://bugs.freedesktop.org/show_bug.cgi?id=32127
+---
+Index: shared-mime-info-0.90/Makefile.am
+===================================================================
+--- shared-mime-info-0.90.orig/Makefile.am 2011-05-25 15:50:18.000000000 -0700
++++ shared-mime-info-0.90/Makefile.am 2011-05-25 15:50:45.153489305 -0700
+@@ -72,7 +72,7 @@
+ create-pot:
+ $(MAKE) -C po shared-mime-info.pot
+
+-check: freedesktop.org.xml check-translations
++check: create-pot freedesktop.org.xml check-translations
+ if test -n $(XMLLINT) ; then \
+ if test -e $(top_builddir)/freedesktop.org.xml; then \
+ xmllint --noout --valid $(top_builddir)/freedesktop.org.xml; \
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
index a806b3672b..cbbd0feed5 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
@@ -1,7 +1,8 @@
require shared-mime-info.inc
PR = "r0"
-SRC_URI += "file://fix-parallel-build.patch"
-
+SRC_URI += "file://fix-parallel-build.patch \
+ file://fix-parallel-build-backport.patch \
+ "
SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b"
SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304"