0001-Remove-incorrect-dependency-from-install-data-hook.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From 3bcb00e27ab09c433fdfecace0d48a6a7ed55ea8 Mon Sep 17 00:00:00 2001
  2. From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  3. Date: Fri, 22 Apr 2016 23:14:32 +0200
  4. Subject: [PATCH] Remove incorrect dependency from install-data-hook
  5. Having install-binPROGRAMS as a dependency of install-data-hook is not
  6. correct, as it causes the installation of programs to be executed
  7. twice, and those two installations are racing with each other, causing
  8. random installation failures.
  9. In addition, this dependency is not needed: the install-data-hook
  10. calls the update-mime-database program in one of two ways:
  11. - When cross-compiling, using the program pointed by
  12. UPDATE_MIME_DATABASE, which is already built, and is not installed
  13. by install-binPROGRAMS.
  14. - When compiling natively, suing the update-mime-database from the
  15. build directory, so there is no need to depend on
  16. install-binPROGRAMS.
  17. This patch is similar to the patch used by the Yocto Project at
  18. http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch.
  19. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  20. [Upstream status:
  21. https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/18]
  22. ---
  23. Makefile.am | 2 +-
  24. 1 file changed, 1 insertion(+), 1 deletion(-)
  25. diff --git a/Makefile.am b/Makefile.am
  26. index 6fc4f73..c318dc3 100644
  27. --- a/Makefile.am
  28. +++ b/Makefile.am
  29. @@ -52,7 +52,7 @@ else
  30. update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)"
  31. endif
  32. -install-data-hook: install-binPROGRAMS
  33. +install-data-hook:
  34. if ENABLE_UPDATE_MIMEDB
  35. $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime"
  36. endif
  37. --
  38. 2.6.4