diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info')
2 files changed, 56 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch new file mode 100644 index 000000000..3c9f1ea43 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -0,0 +1,23 @@ +fix shared-mime-info build race condition + +The definition of install-data-hook in Makefile.am leads +to multiple, overlapping, executions of install-binPROGRAMS +target. We modify the definition to avoid that. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <jslater@windriver.com> + +--- a/Makefile.am ++++ b/Makefile.am +@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status + @INTLTOOL_XML_RULE@ + @INTLTOOL_DESKTOP_RULE@ + +-install-data-hook: install-binPROGRAMS ++# do NOT make this dependent on anything! ++# ++install-data-hook: + if ENABLE_UPDATE_MIMEDB + $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" + endif diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch new file mode 100644 index 000000000..84c4d0373 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch @@ -0,0 +1,33 @@ +The Makefile used by shared-mime-info is one big race with the SUBDIRS +option and the dependency specifically calling make all combining to +create multiple make instances all of which may try and build targets +like update-mime-database. + +This patch removes those options meaning make can correctly identify +dependencies and stop itself racing itself. + +RP 10/10/2011 + +Upstream-Status: Pending +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> + +Index: shared-mime-info-1.0/Makefile.am +=================================================================== +--- shared-mime-info-1.0.orig/Makefile.am ++++ shared-mime-info-1.0/Makefile.am +@@ -1,5 +1,3 @@ +-SUBDIRS=. po +- + AM_CPPFLAGS = $(ALL_CFLAGS) + + packagesdir = $(datadir)/mime/packages +@@ -72,8 +70,7 @@ uninstall-hook: + + all: $(defaultmakedeps) + +-create-pot: +- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot ++create-pot: po + + check: create-pot freedesktop.org.xml update-mime-database check-translations + if test -e $(top_builddir)/freedesktop.org.xml; then \ |
