summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
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:16 +0100
commit859e21aac1584fe07e5cc7030e7f8918170291f9 (patch)
treee54bbb298bcba5dbf707197eb89f9ea5f454dc75 /meta/recipes-support
parent5b0900b7644f7aa275f40942bb6e1996f2e6670e (diff)
downloadpoky-859e21aac1584fe07e5cc7030e7f8918170291f9.tar.gz
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. (From OE-Core rev: b56d984d59b5ea682f115b8ceeb04fbffe01f13c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-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 @@
1Backport fix for https://bugs.freedesktop.org/show_bug.cgi?id=32127
2
3Upstream-Status: Inappropriate [Backport]
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7From 68e31f61f5e50e5222bc05437d1123e932922796 Mon Sep 17 00:00:00 2001
8From: Samuli Suominen <ssuominen@gentoo.org>
9Date: Mon, 06 Dec 2010 19:46:57 +0000
10Subject: Fix parallel build
11
12https://bugs.freedesktop.org/show_bug.cgi?id=32127
13---
14Index: shared-mime-info-0.90/Makefile.am
15===================================================================
16--- shared-mime-info-0.90.orig/Makefile.am 2011-05-25 15:50:18.000000000 -0700
17+++ shared-mime-info-0.90/Makefile.am 2011-05-25 15:50:45.153489305 -0700
18@@ -72,7 +72,7 @@
19 create-pot:
20 $(MAKE) -C po shared-mime-info.pot
21
22-check: freedesktop.org.xml check-translations
23+check: create-pot freedesktop.org.xml check-translations
24 if test -n $(XMLLINT) ; then \
25 if test -e $(top_builddir)/freedesktop.org.xml; then \
26 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 @@
1require shared-mime-info.inc 1require shared-mime-info.inc
2PR = "r0" 2PR = "r0"
3 3
4SRC_URI += "file://fix-parallel-build.patch" 4SRC_URI += "file://fix-parallel-build.patch \
5 5 file://fix-parallel-build-backport.patch \
6 "
6SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b" 7SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b"
7SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304" 8SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304"