diff options
author | Qing He <qing.he@intel.com> | 2011-04-29 10:55:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-04 00:51:05 +0100 |
commit | 122f8e4af98a049de01526a6d09e7eb422494b9a (patch) | |
tree | 142cb04acab925ea547c5e03252dbc66ceb4e6a7 /meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch | |
parent | bb92a1852e17232c07658eef013f243ca6780563 (diff) | |
download | openembedded-core-contrib-122f8e4af98a049de01526a6d09e7eb422494b9a.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
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch')
-rw-r--r-- | meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch | 33 |
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 @@ +the check rule will trigger a weird dependency issue in automake, +it's possible that update-mime-database are invoked simultaneously in +two different threads at the same time. + +As a workaround, revert it to the logic in 0.80 + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: qing He <qing.he@intel.com> + +diff --git a/Makefile.am b/Makefile.am +index 1a887bc..9df581e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -72,7 +72,7 @@ uninstall-hook: + create-pot: + $(MAKE) -C po shared-mime-info.pot + +-check: freedesktop.org.xml update-mime-database check-translations ++check: 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; \ +@@ -80,9 +80,6 @@ check: freedesktop.org.xml update-mime-database check-translations + xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml; \ + fi \ + fi +- if test -d .git/ && test -x $(top_builddir)/update-mime-database && test -d $(top_srcdir)/mime-db-tests ; then \ +- $(top_builddir)/update-mime-database mime-db-tests/ ; \ +- fi + if test -d .git/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \ + mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \ + cp -a $(top_builddir)/freedesktop.org.xml $(top_builddir)/temp-mime-dir/mime/packages/ ; \ |