mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-02 13:29:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

ghostscript: Really fix parallel make race

Browse Source 
There continue to be parallel make race issues showing up on the autobuilder.
This patch removes some potential sources of these. The rm is unrequired
since we're using cp -f. The || true ensures that if we did race against
someone it becomes harmless.

[YOCTO #1202]

(From OE-Core rev: 32840cd95fcde92433fbb0271b82d0f4048a823a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-11-25 13:10:41 +00:00
parent d7db3680ba
commit b06b1b0811
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
View File

@@ -4,6 +4,8 @@ http://bugzilla.pokylinux.org/show_bug.cgi?id=1202
Upstream-Status: Pending
Signed-off-by: Kang Kai <kai.kang@windriver.com>
RP: Tweaked to include lib.mak fixes
--- ghostscript-9.02/base/unixhead.mak.orig 2011-07-27 17:06:17.749456100 +0800
+++ ghostscript-9.02/base/unixhead.mak 2011-07-27 17:06:37.449456100 +0800
@@ -54,7 +54,7 @@
@@ -15,3 +17,20 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
RM_=rm -f
RMN_=rm -f
Index: ghostscript-9.04/base/lib.mak
===================================================================
--- ghostscript-9.04.orig/base/lib.mak 2011-11-25 13:06:21.728502636 +0000
+++ ghostscript-9.04/base/lib.mak 2011-11-25 13:08:33.924504957 +0000
@@ -592,10 +592,8 @@
$(gscdefs_h) $(gconf_h)\
$(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\
$(MAKEDDIRS)
- $(RM_) $(GLGEN)gconfig.c
- $(RM_) $(GLGEN)gconfig.h
- $(CP_) $(gconfig_h) $(GLGEN)gconfig.h
- $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c
+ $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true
+ $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true
$(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c
$(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\