summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/shared-mime-info/files
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-04-29 10:55:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:54:43 +0100
commitf61514e3d8503011b6f8fe44f12851e16ba4a8ea (patch)
tree8e607cafa2c7d7b016a150fe7d798985949c7ba6 /meta/recipes-support/shared-mime-info/files
parenta29b96e3828ecf8a4915856d1e6733a97cd4b89f (diff)
downloadpoky-f61514e3d8503011b6f8fe44f12851e16ba4a8ea.tar.gz
shared-mime-info: upgrade to version 0.90
from 0.80 - parallel build with 0.9 is buggy, disable part of the check for now (From OE-Core rev: 122f8e4af98a049de01526a6d09e7eb422494b9a) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/shared-mime-info/files')
-rw-r--r--meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch b/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
new file mode 100644
index 0000000000..ea8b05eae3
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
@@ -0,0 +1,33 @@
1the check rule will trigger a weird dependency issue in automake,
2it's possible that update-mime-database are invoked simultaneously in
3two different threads at the same time.
4
5As a workaround, revert it to the logic in 0.80
6
7Upstream-Status: Inappropriate [workaround]
8
9Signed-off-by: qing He <qing.he@intel.com>
10
11diff --git a/Makefile.am b/Makefile.am
12index 1a887bc..9df581e 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -72,7 +72,7 @@ uninstall-hook:
16 create-pot:
17 $(MAKE) -C po shared-mime-info.pot
18
19-check: freedesktop.org.xml update-mime-database check-translations
20+check: freedesktop.org.xml check-translations
21 if test -n $(XMLLINT) ; then \
22 if test -e $(top_builddir)/freedesktop.org.xml; then \
23 xmllint --noout --valid $(top_builddir)/freedesktop.org.xml; \
24@@ -80,9 +80,6 @@ check: freedesktop.org.xml update-mime-database check-translations
25 xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml; \
26 fi \
27 fi
28- if test -d .git/ && test -x $(top_builddir)/update-mime-database && test -d $(top_srcdir)/mime-db-tests ; then \
29- $(top_builddir)/update-mime-database mime-db-tests/ ; \
30- fi
31 if test -d .git/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \
32 mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \
33 cp -a $(top_builddir)/freedesktop.org.xml $(top_builddir)/temp-mime-dir/mime/packages/ ; \