summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-10-05 12:46:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-10 10:00:10 +0100
commit3a1fa7dd5982e812a449e5220d64e511821b07df (patch)
tree92a5355f4d8dab9e3cdfcf8d2ed35321edae9d03 /meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
parent4050aa4252d4209e44dbc0367a3192dc82664061 (diff)
downloadpoky-3a1fa7dd5982e812a449e5220d64e511821b07df.tar.gz
shared-mime-info: Upgrade recipes from 0.90 -> 0.91
The parallel build problems are solved upstream therefore removed License file has been corrected to use 'GNU Lesser GPL' instead of 'GNU library GPL' and some indentation changes The license is LGPLv2+ therefore mark it so (From OE-Core rev: 30e8ceb8d78d9dd0a381dd4e47da2ec6c449beaf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch33
1 files changed, 0 insertions, 33 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
deleted file mode 100644
index ea8b05eae3..0000000000
--- a/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
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/ ; \