mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
shared-mime-info: Fix a parallel make race
(From OE-Core rev: 486b17af3e4cced76e9852e7634f75ea87433db2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
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
|
||||
|
||||
Index: shared-mime-info-0.91/Makefile.am
|
||||
===================================================================
|
||||
--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100
|
||||
+++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100
|
||||
@@ -1,5 +1,3 @@
|
||||
-SUBDIRS=. po
|
||||
-
|
||||
INCLUDES = $(ALL_CFLAGS)
|
||||
|
||||
packagesdir = $(datadir)/mime/packages
|
||||
@@ -70,8 +68,7 @@
|
||||
|
||||
all: check create-pot
|
||||
|
||||
-create-pot:
|
||||
- $(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 \
|
||||
@@ -1,6 +1,7 @@
|
||||
require shared-mime-info.inc
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
|
||||
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
|
||||
|
||||
SRC_URI =+ "file://parallelmake.patch"
|
||||
|
||||
Reference in New Issue
Block a user