summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-25 13:10:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-27 10:25:33 +0000
commitb06b1b0811bea6ba5ed04f28c06be0f404924cc5 (patch)
tree3ff7ba7956864c956ff66c915e7599becdc5dc31
parentd7db3680ba7af1a5c56a19d8db32873a2784016b (diff)
downloadpoky-b06b1b0811bea6ba5ed04f28c06be0f404924cc5.tar.gz
ghostscript: Really fix parallel make race
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>
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch19
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.04.bb2
2 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
index 76d167650d..bb0c41c40c 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
@@ -4,6 +4,8 @@ http://bugzilla.pokylinux.org/show_bug.cgi?id=1202
4Upstream-Status: Pending 4Upstream-Status: Pending
5 5
6Signed-off-by: Kang Kai <kai.kang@windriver.com> 6Signed-off-by: Kang Kai <kai.kang@windriver.com>
7
8RP: Tweaked to include lib.mak fixes
7--- ghostscript-9.02/base/unixhead.mak.orig 2011-07-27 17:06:17.749456100 +0800 9--- ghostscript-9.02/base/unixhead.mak.orig 2011-07-27 17:06:17.749456100 +0800
8+++ ghostscript-9.02/base/unixhead.mak 2011-07-27 17:06:37.449456100 +0800 10+++ ghostscript-9.02/base/unixhead.mak 2011-07-27 17:06:37.449456100 +0800
9@@ -54,7 +54,7 @@ 11@@ -54,7 +54,7 @@
@@ -15,3 +17,20 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
15 RM_=rm -f 17 RM_=rm -f
16 RMN_=rm -f 18 RMN_=rm -f
17 19
20Index: ghostscript-9.04/base/lib.mak
21===================================================================
22--- ghostscript-9.04.orig/base/lib.mak 2011-11-25 13:06:21.728502636 +0000
23+++ ghostscript-9.04/base/lib.mak 2011-11-25 13:08:33.924504957 +0000
24@@ -592,10 +592,8 @@
25 $(gscdefs_h) $(gconf_h)\
26 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\
27 $(MAKEDDIRS)
28- $(RM_) $(GLGEN)gconfig.c
29- $(RM_) $(GLGEN)gconfig.h
30- $(CP_) $(gconfig_h) $(GLGEN)gconfig.h
31- $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c
32+ $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true
33+ $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true
34 $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c
35
36 $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.04.bb b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
index dba92e9aba..d4448109bb 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
@@ -15,7 +15,7 @@ SECTION = "console/utils"
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
17 17
18PR = "r0" 18PR = "r1"
19 19
20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" 20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
21DEPENDS_virtclass-native = "" 21DEPENDS_virtclass-native = ""