Skip to contentSkip to conversation

shared-mime-info: Fix a parallel make race

PATCH Richard Purdie 2 participants 3 messages Oct 10, 2011 – Oct 11, 2011

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw
Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch renamed from dev/null +32 -0
new file mode 100644
index 0000000..9e86a71
@@ -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 \
meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +1 -0
index 76d2756..ac2dde1 100644
@@ -4,3 +4,4 @@ PR = "r0"
 SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
 SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
 
+SRC_URI =+ "file://parallelmake.patch"
#1 lore raw

Op 10 okt. 2011, om 14:54 heeft Richard Purdie het volgende geschreven:

Quoted 50 lines
Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch renamed from dev/null +32 -0
new file mode 100644
index 0000000..9e86a71
@@ -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 \
meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +0 -0
index 76d2756..ac2dde1 100644
@@ -4,3 +4,4 @@ PR = "r0"

SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"

Quoted 1 line

+SRC_URI =+ "file://parallelmake.patch"

Missing PR bump

author Applied
#2 lore raw
Quoted 52 lines · Koen Kooi

Op 10 okt. 2011, om 14:54 heeft Richard Purdie het volgende geschreven:

Quoted 50 lines
Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch renamed from dev/null +32 -0
new file mode 100644
index 0000000..9e86a71
@@ -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 \
meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +0 -0
index 76d2756..ac2dde1 100644
@@ -4,3 +4,4 @@ PR = "r0"

SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"

Quoted 3 lines
Quoted 1 line

+SRC_URI =+ "file://parallelmake.patch"

Missing PR bump

Merged to master, with a PR bump.

Cheers,

Richard