sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Qing He 2011-04-29 10:55:05 +08:00 committed by Richard Purdie
parent a29b96e382
commit f61514e3d8
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,5 +0,0 @@
require shared-mime-info.inc
PR = "r0"
SRC_URI[md5sum] = "eb8d24a6a80888849c9db7f30232ba6a"
SRC_URI[sha256sum] = "80857ba19f8066bfc8d998bfc72b492e241ebd52d49c245aae9fd5b3d233b024"

7
meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb Normal file
View File

@ -0,0 +1,7 @@
require shared-mime-info.inc
PR = "r0"
SRC_URI += "file://fix-parallel-build.patch"
SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b"
SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304"