summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-01-17 22:29:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-19 13:24:38 +0000
commit3d3f59d2c8315ffd34ab9867870642fec4fe1c2b (patch)
treefa15ec80e694dfa186f6d64b82e02f9420fb4dfb /meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
parent25be13002bd4127f24e2273f44951862b4a481c7 (diff)
downloadpoky-3d3f59d2c8315ffd34ab9867870642fec4fe1c2b.tar.gz
shared-mime-info: upgrade 1.10 -> 1.15
* sources/development moved to freedesktop's gitlab * patches do not apply any more due to major changes in Makefile.am * give up bb/inc separation (From OE-Core rev: 09ef7f8e4b9742b17a0bf7a48970ece2298eaeba) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch')
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
deleted file mode 100644
index 262ff7562c..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1fix shared-mime-info build race condition
2
3The definition of install-data-hook in Makefile.am leads
4to multiple, overlapping, executions of install-binPROGRAMS
5target. We modify the definition to avoid that.
6
7Upstream-Status: Pending
8
9Signed-off-by: Joe Slater <jslater@windriver.com>
10
11Index: shared-mime-info-1.9/Makefile.am
12===================================================================
13--- shared-mime-info-1.9.orig/Makefile.am
14+++ shared-mime-info-1.9/Makefile.am
15@@ -50,7 +50,9 @@ else
16 update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)"
17 endif
18
19-install-data-hook: install-binPROGRAMS
20+# do NOT make this dependent on anything!
21+#
22+install-data-hook:
23 if ENABLE_UPDATE_MIMEDB
24 $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime"
25 endif