From 5094da32327fb6a6ef499bf99bd3e0f48cb77bc9 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 7 Jun 2012 16:37:00 -0700 Subject: shared-mime-info: fix build race condition The definition of install-data-hook in Makefile.am leads to multiple, overlapping, executions of the install-binPROGRAMS target. We modify the definition to avoid that. (From OE-Core rev: 6fef8f73143fdeed6da15444c11bce9a8b35668b) Signed-off-by: Joe Slater Signed-off-by: Mark Hatle Signed-off-by: Elizabeth Flanagan Signed-off-by: Richard Purdie --- .../shared-mime-info/install-data-hook.patch | 21 +++++++++++++++++++++ .../shared-mime-info/shared-mime-info_0.91.bb | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch 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 new file mode 100644 index 0000000000..4c075f2549 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -0,0 +1,21 @@ +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. + +Signed-off-by: Joe Slater + +--- 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/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb index 7ae6e10962..910cb7fc5d 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb @@ -1,7 +1,8 @@ require shared-mime-info.inc -PR = "r3" +PR = "r4" SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc" SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd" -SRC_URI =+ "file://parallelmake.patch" +SRC_URI =+ "file://parallelmake.patch \ + file://install-data-hook.patch" -- cgit v1.2.3-54-g00ecf