Patchwork [1/1] ghostscript: fix parallel make issue

login
register
mail settings
Submitter Kang Kai
Date March 28, 2012, 9:41 a.m.
Message ID <a913503c671f8442d554a5f54cf93bcf8219a53d.1332927487.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/24717/
State New
Headers show

Comments

Kang Kai - March 28, 2012, 9:41 a.m.
[Yocto 1202]

Update ghostscript-9.02-parallel-make.patch to fix parallel make
failure.
Bump up PR.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 .../ghostscript-9.02-parallel-make.patch           |   13 +++++++++++++
 .../ghostscript/ghostscript_9.05.bb                |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)
Richard Purdie - March 29, 2012, 9:29 p.m.
On Wed, 2012-03-28 at 17:41 +0800, Kang Kai wrote:
> [Yocto 1202]
> 
> Update ghostscript-9.02-parallel-make.patch to fix parallel make
> failure.
> Bump up PR.
> 
> Signed-off-by: Kang Kai <kai.kang@windriver.com>
> ---
>  .../ghostscript-9.02-parallel-make.patch           |   13 +++++++++++++
>  .../ghostscript/ghostscript_9.05.bb                |    2 +-
>  2 files changed, 14 insertions(+), 1 deletions(-)

Sadly the makefiles are littered with CP_ races. I've merged a patch
which hopefully addresses them all rather than fixing them up one by one
as they occur.

Cheers,

Richard

Patch

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 bb0c41c..94ad5f5 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
@@ -1,6 +1,8 @@ 
 When parallel make it will fail with multi copy, see
 http://bugzilla.pokylinux.org/show_bug.cgi?id=1202
 
+Update for psi/int.mak to avoid parallel build error.
+
 Upstream-Status: Pending
 
 Signed-off-by: Kang Kai <kai.kang@windriver.com>
@@ -34,3 +36,14 @@  Index: ghostscript-9.04/base/lib.mak
  	$(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c
  
  $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\
+--- ghostscript-9.05/psi/int.mak.orig	2012-03-28 14:48:20.082048252 +0800
++++ ghostscript-9.05/psi/int.mak	2012-03-28 14:55:03.142053958 +0800
+@@ -272,7 +272,7 @@
+  $(gconf_h) $(gconfigd_h) $(gsmemory_h) $(gstypes_h)\
+  $(iminst_h) $(iref_h) $(ivmspace_h) $(opdef_h) $(iplugin_h)
+ 	$(RM_) $(PSGEN)iconfig.c
+-	$(CP_) $(gconfig_h) $(PSGEN)gconfig.h
++	-$(CP_) $(gconfig_h) $(PSGEN)gconfig.h
+ 	$(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c
+ 	$(PSCC) $(PSO_)iconfig.$(OBJ) $(C_) $(PSGEN)iconfig.c
+ 
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
index 67b1cf7..6fc9f57 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
@@ -15,7 +15,7 @@  SECTION = "console/utils"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
 DEPENDS_virtclass-native = ""