diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-18 17:03:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-18 23:14:51 +0000 |
commit | 6107be140fdec204586850ea1f7e4b968be7670b (patch) | |
tree | 0c12daad5c95c27e35499b5e70f01fc36b85d297 /recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch | |
parent | 73d84b7f1fbf99c0db30c8ffe4c270e2803203fd (diff) | |
download | meta-gplv2-6107be140fdec204586850ea1f7e4b968be7670b.tar.gz |
shared-mime-info: Add 1.10 from OE-Core3.1_M2
Later versions of shared-mime-info need itstool which is GPLv3. Add an old
version of shared-mime-info to allow gplv3 free builds to suceed.
Use python to set PREFERRED_VERSION based on INCOMPATIBLE_LICENSE to
control this.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch')
-rw-r--r-- | recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch new file mode 100644 index 0000000..fea34a5 --- /dev/null +++ b/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | The Makefile used by shared-mime-info is one big race with the SUBDIRS | ||
2 | option and the dependency specifically calling make all combining to | ||
3 | create multiple make instances all of which may try and build targets | ||
4 | like update-mime-database. | ||
5 | |||
6 | This patch removes those options meaning make can correctly identify | ||
7 | dependencies and stop itself racing itself. | ||
8 | |||
9 | RP 10/10/2011 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
13 | |||
14 | Index: shared-mime-info-1.9/Makefile.am | ||
15 | =================================================================== | ||
16 | --- shared-mime-info-1.9.orig/Makefile.am | ||
17 | +++ shared-mime-info-1.9/Makefile.am | ||
18 | @@ -1,5 +1,3 @@ | ||
19 | -SUBDIRS=. po | ||
20 | - | ||
21 | AM_CPPFLAGS = $(ALL_CFLAGS) | ||
22 | |||
23 | packagesdir = $(datadir)/mime/packages | ||
24 | @@ -81,8 +79,7 @@ endif | ||
25 | |||
26 | all: $(defaultmakedeps) | ||
27 | |||
28 | -create-pot: | ||
29 | - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot | ||
30 | +create-pot: po | ||
31 | |||
32 | local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) | ||
33 | if CROSS_COMPILING | ||