mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 06:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

shared-mime-info_0.90.bb: Fix more parallel build issues

Browse Source 
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>
This commit is contained in:
Khem Raj
2011-05-25 15:56:27 -07:00
committed by Richard Purdie
parent 5b0900b764
commit 859e21aac1
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch Normal file
View File

@@ -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; \

5
meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
View File

@@ -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"