diff options
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch | 852 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.05.bb | 2 |
2 files changed, 844 insertions, 10 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 bb0c41c40..8491053f9 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 @@ -5,9 +5,14 @@ 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 +RP: Extended || true to all CP_ operations, they all can race e.g.: +| cp -f ./obj/gconfxx.h ./obj/gconfig.h +| cp: cannot create regular file `./obj/gconfig.h': File exists + +Index: ghostscript-9.05/base/unixhead.mak +=================================================================== +--- ghostscript-9.05.orig/base/unixhead.mak 2012-03-28 10:55:23.804608117 +0000 ++++ ghostscript-9.05/base/unixhead.mak 2012-03-28 10:56:47.544606075 +0000 @@ -54,7 +54,7 @@ # Define generic commands. @@ -17,11 +22,20 @@ RP: Tweaked to include lib.mak fixes RM_=rm -f RMN_=rm -f -Index: ghostscript-9.04/base/lib.mak +Index: ghostscript-9.05/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 @@ +--- ghostscript-9.05.orig/base/lib.mak 2012-03-28 10:55:23.816608117 +0000 ++++ ghostscript-9.05/base/lib.mak 2012-03-28 10:55:41.864605914 +0000 +@@ -327,7 +327,7 @@ + $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE) + $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22 + $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h +- $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c ++ $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c || true + $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c + $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h + +@@ -593,22 +593,20 @@ $(gscdefs_h) $(gconf_h)\ $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\ $(MAKEDDIRS) @@ -29,8 +43,828 @@ Index: ghostscript-9.04/base/lib.mak - $(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 ++ $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true || true ++ $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true || true $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\ + $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS) + $(RM_) $(GLGEN)gscdefs.c +- $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c ++ $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c || true + $(GLCC) $(GLO_)gscdefs.$(OBJ) $(C_) $(GLGEN)gscdefs.c + + $(AUX)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\ + $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS) + $(RM_) $(AUX)gscdefs.c +- $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c ++ $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c || true + $(GLCCAUX) $(AUXO_)gscdefs.$(OBJ) $(C_) $(AUX)gscdefs.c + + $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\ +@@ -1428,7 +1426,7 @@ + $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c + + $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) +- $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ) ++ $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ) || true + + # sdcparam is used by the filter operator and the PS/PDF writer. + # It is not included automatically in sdcte/d. +@@ -1456,7 +1454,7 @@ + $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c + + $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ) ++ $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ) || true + + + $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ +@@ -1472,7 +1470,7 @@ + $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c + + $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ) ++ $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ) || true + + # sdeparam is used by the filter operator and the PS/PDF writer. + # It is not included automatically in sdcte. +@@ -1504,7 +1502,7 @@ + $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c + + $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ) ++ $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ) || true + + + $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ +@@ -1521,7 +1519,7 @@ + + + $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ) ++ $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ) || true + + # sddparam is used by the filter operator. + # It is not included automatically in sdctd. +@@ -1544,7 +1542,7 @@ + + # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory. + $(GLD)slzwe.dev : $(GLD)lzwe.dev +- $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev ++ $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev || true + + $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\ + $(slzwx_h) $(strimpl_h) $(MAKEDIRS) +@@ -1560,7 +1558,7 @@ + + # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory. + $(GLD)slzwd.dev : $(GLD)lzwd.dev +- $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev ++ $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev || true + + $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\ + $(slzwx_h) $(strimpl_h) $(MAKEDIRS) +@@ -1610,7 +1608,7 @@ + # ---------------- JBIG2 compression filter ---------------- # + + $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev +- $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev ++ $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev || true + + # jbig2dec version + sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ) +@@ -1646,7 +1644,7 @@ + # ---------------- JPEG 2000 compression filter ---------------- # + + $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev +- $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev ++ $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev || true + + # jasper version + sjpx_jasper=$(GLOBJ)sjpx.$(OBJ) +@@ -1784,7 +1782,7 @@ + $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c + + $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ) ++ $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ) || true + + szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ) + $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_) +@@ -1800,7 +1798,7 @@ + $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c + + $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ) ++ $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ) || true + + szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ) + $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_) +@@ -1816,7 +1814,7 @@ + $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c + + $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ) ++ $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ) || true + + # ---------------- Page devices ---------------- # + # We include this here, rather than in devs.mak, because it is more like +@@ -2757,7 +2755,7 @@ + $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c + + $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) +- $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) ++ $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) || true + + + $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ +@@ -2769,7 +2767,7 @@ + $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c + + $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) +- $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) ++ $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true + + # Note that gsicc_create requires compile with lcms to obtain icc34.h + # header file that is used for creating ICC structures from PS objects. +@@ -2789,7 +2787,7 @@ + $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c + + $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ) ++ $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ) || true + + + #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */ +@@ -3060,7 +3058,7 @@ + $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS) + + $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS) +- $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c ++ $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c || true + + # the following module is only included if the romfs.dev FEATURE is enabled + $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ +@@ -3076,7 +3074,7 @@ + $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c + + $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) +- $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ) ++ $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ) || true + + $(GLOBJ)gsromfs1.$(OBJ) : $(GLOBJ)gsromfs1.c $(time__h) $(MAKEDIRS) + $(GLCC) $(GLO_)gsromfs1.$(OBJ) $(C_) $(GLOBJ)gsromfs1.c +Index: ghostscript-9.05/base/expat.mak +=================================================================== +--- ghostscript-9.05.orig/base/expat.mak 2012-03-28 10:55:34.164607877 +0000 ++++ ghostscript-9.05/base/expat.mak 2012-03-28 10:55:41.852604931 +0000 +@@ -81,7 +81,7 @@ + # Copy the target definition we want + $(EXPATGEN)expat.dev : $(TOP_MAKEFILES) $(EXPAT_MAK) \ + $(EXPATGEN)expat_$(SHARE_EXPAT).dev +- $(CP_) $(EXPATGEN)expat_$(SHARE_EXPAT).dev $(EXPATGEN)expat.dev ++ $(CP_) $(EXPATGEN)expat_$(SHARE_EXPAT).dev $(EXPATGEN)expat.dev || true + + # Define the compiled in target + $(EXPATGEN)expat_0.dev : $(EXPAT_MAK) $(ECHOGS_XE) $(expat_) +Index: ghostscript-9.05/base/freetype.mak +=================================================================== +--- ghostscript-9.05.orig/base/freetype.mak 2012-03-28 10:55:34.180607877 +0000 ++++ ghostscript-9.05/base/freetype.mak 2012-03-28 10:55:41.852604931 +0000 +@@ -193,7 +193,7 @@ + + # instantiate the requested build option (shared or compiled in) + $(FTGEN)freetype.dev : $(TOP_MAKEFILES) $(FTGEN)freetype_$(SHARE_FT).dev +- $(CP_) $(FTGEN)freetype_$(SHARE_FT).dev $(FTGEN)freetype.dev ++ $(CP_) $(FTGEN)freetype_$(SHARE_FT).dev $(FTGEN)freetype.dev || true + + # Define the shared version. + $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/ijs.mak +=================================================================== +--- ghostscript-9.05.orig/base/ijs.mak 2012-03-28 10:55:34.224607876 +0000 ++++ ghostscript-9.05/base/ijs.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -64,7 +64,7 @@ + + + $(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(IJSGEN)ijslib_$(SHARE_IJS).dev +- $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev ++ $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev || true + + + ijs_h=$(IJSSRC)ijs.h +Index: ghostscript-9.05/base/jasper.mak +=================================================================== +--- ghostscript-9.05.orig/base/jasper.mak 2012-03-28 10:55:34.240607876 +0000 ++++ ghostscript-9.05/base/jasper.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -164,7 +164,7 @@ + + # switch in the selected .dev + $(JASGEN)jasper.dev : $(TOP_MAKEFILES) $(JASGEN)jasper_$(SHARE_JPX).dev +- $(CP_) $(JASGEN)jasper_$(SHARE_JPX).dev $(JASGEN)jasper.dev ++ $(CP_) $(JASGEN)jasper_$(SHARE_JPX).dev $(JASGEN)jasper.dev || true + + # external link .dev + $(JASGEN)jasper_1.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/jbig2.mak +=================================================================== +--- ghostscript-9.05.orig/base/jbig2.mak 2012-03-28 10:55:34.256607875 +0000 ++++ ghostscript-9.05/base/jbig2.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -96,7 +96,7 @@ + + # switch in the version of libjbig2.dev we're actually using + $(JBIG2GEN)jbig2dec.dev : $(TOP_MAKEFILES) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev +- $(CP_) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev $(JBIG2GEN)jbig2dec.dev ++ $(CP_) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev $(JBIG2GEN)jbig2dec.dev || true + + # dev file for shared (separately built) jbig2dec library + $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/jpeg.mak +=================================================================== +--- ghostscript-9.05.orig/base/jpeg.mak 2012-03-28 10:55:34.272607875 +0000 ++++ ghostscript-9.05/base/jpeg.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -94,7 +94,7 @@ + jmorecfg_h=$(GLGEN)jmorecfg.h + + $(GLGEN)jconfig_.h : $(GLGEN)jconfig$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS) +- $(CP_) $(GLGEN)jconfig$(SHARE_JPEG).h $(GLGEN)jconfig_.h ++ $(CP_) $(GLGEN)jconfig$(SHARE_JPEG).h $(GLGEN)jconfig_.h || true + + $(GLGEN)jconfig0.h : $(ECHOGS_XE) $(GLSRC)gsjconf.h $(stdpre_h) $(MAKEFILE)\ + $(MAKEDIRS) +@@ -106,13 +106,13 @@ + $(RMN_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h + + $(GLGEN)jconfig.h : $(GLGEN)jconfig0.h $(MAKEDIRS) +- $(CP_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h ++ $(CP_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h || true + + $(GLGEN)jmorecf_.h : $(GLGEN)jmorecf$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS) +- $(CP_) $(GLGEN)jmorecf$(SHARE_JPEG).h $(GLGEN)jmorecf_.h ++ $(CP_) $(GLGEN)jmorecf$(SHARE_JPEG).h $(GLGEN)jmorecf_.h || true + + $(GLGEN)jmorecf0.h : $(GLSRC)gsjmorec.h $(GLGEN)jmcorig.h $(MAKEDIRS) +- $(CP_) $(GLSRC)gsjmorec.h $(GLGEN)jmorecf0.h ++ $(CP_) $(GLSRC)gsjmorec.h $(GLGEN)jmorecf0.h || true + $(RM_) $(GLGEN)jmorecf1.h + + $(GLGEN)jmorecf1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS) +@@ -120,10 +120,10 @@ + $(RMN_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h + + $(GLGEN)jmorecfg.h : $(GLGEN)jmorecf0.h $(MAKEDIRS) +- $(CP_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h ++ $(CP_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h || true + + $(GLGEN)jmcorig.h : $(JSRC)jmorecfg.h $(MAKEDIRS) +- $(CP_) $(JSRC)jmorecfg.h $(GLGEN)jmcorig.h ++ $(CP_) $(JSRC)jmorecfg.h $(GLGEN)jmcorig.h || true + + # Contrary to what some portability bigots assert as fact, C compilers are + # not consistent about where they start searching for #included files: +@@ -139,23 +139,23 @@ + JHCOPY=$(GLGEN)jinclude.h $(GLGEN)jpeglib.h + + $(GLGEN)jinclude.h : $(JSRC)jinclude.h $(MAKEDIRS) +- $(CP_) $(JSRC)jinclude.h $(GLGEN)jinclude.h ++ $(CP_) $(JSRC)jinclude.h $(GLGEN)jinclude.h || true + + # jpeglib_.h doesn't really depend on jconfig.h or jmcorig.h, + # but we choose to put the dependencies here rather than in the + # definition of jpeglib__h. + $(GLGEN)jpeglib_.h : $(GLGEN)jpeglib$(SHARE_JPEG).h $(MAKEDIRS) +- $(CP_) $(GLGEN)jpeglib$(SHARE_JPEG).h $(GLGEN)jpeglib_.h ++ $(CP_) $(GLGEN)jpeglib$(SHARE_JPEG).h $(GLGEN)jpeglib_.h || true + + $(GLGEN)jpeglib0.h : $(JSRC)jpeglib.h $(jconfig_h) $(jmorecfg_h) $(MAKEDIRS) +- $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib0.h ++ $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib0.h || true + + $(GLGEN)jpeglib1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS) + $(EXP)$(ECHOGS_XE) -w $(GLGEN)jpeglib1.h -x 23 include -x 203c jpeglib.h -x 3e + + # We also need jpeglib.h for #includes in the library itself. + $(GLGEN)jpeglib.h : $(JSRC)jpeglib.h $(MAKEDIRS) +- $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib.h ++ $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib.h || true + + # In order to avoid having to keep the dependency lists for the IJG code + # accurate, we simply make all of them depend on the only files that +@@ -172,40 +172,40 @@ + $(SETMOD) $(JGEN)jpegc0 $(jpegc0_) + + $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP) +- $(CP_) $(JSRC)jcomapi.c $(GLGEN)jcomapi.c ++ $(CP_) $(JSRC)jcomapi.c $(GLGEN)jcomapi.c || true + $(JCC) $(JO_)jcomapi.$(OBJ) $(C_) $(GLGEN)jcomapi.c + $(RM_) $(GLGEN)jcomapi.c + + $(JOBJ)jutils.$(OBJ) : $(JSRC)jutils.c $(JDEP) +- $(CP_) $(JSRC)jutils.c $(GLGEN)jutils.c ++ $(CP_) $(JSRC)jutils.c $(GLGEN)jutils.c || true + $(JCC) $(JO_)jutils.$(OBJ) $(C_) $(GLGEN)jutils.c + $(RM_) $(GLGEN)jutils.c + + $(JOBJ)jmemmgr.$(OBJ) : $(JSRC)jmemmgr.c $(JDEP) +- $(CP_) $(JSRC)jmemmgr.c $(GLGEN)jmemmgr.c ++ $(CP_) $(JSRC)jmemmgr.c $(GLGEN)jmemmgr.c || true + $(JCC) $(JO_)jmemmgr.$(OBJ) $(C_) $(GLGEN)jmemmgr.c + $(RM_) $(GLGEN)jmemmgr.c + + $(JOBJ)jerror.$(OBJ) : $(JSRC)jerror.c $(JDEP) +- $(CP_) $(JSRC)jerror.c $(GLGEN)jerror.c ++ $(CP_) $(JSRC)jerror.c $(GLGEN)jerror.c || true + $(JCC) $(JO_)jerror.$(OBJ) $(C_) $(GLGEN)jerror.c + $(RM_) $(GLGEN)jerror.c + + $(JOBJ)jaricom.$(OBJ) : $(JSRC)jaricom.c $(JDEP) +- $(CP_) $(JSRC)jaricom.c $(GLGEN)jaricom.c ++ $(CP_) $(JSRC)jaricom.c $(GLGEN)jaricom.c || true + $(JCC) $(JO_)jaricom.$(OBJ) $(C_) $(GLGEN)jaricom.c + $(RM_) $(GLGEN)jaricom.c + + # Encoding (compression) code. + + $(JGEN)jpege.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpege_$(SHARE_JPEG).dev +- $(CP_) $(JGEN)jpege_$(SHARE_JPEG).dev $(JGEN)jpege.dev ++ $(CP_) $(JGEN)jpege_$(SHARE_JPEG).dev $(JGEN)jpege.dev || true + + $(JGEN)jpege_1.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(ECHOGS_XE) + $(SETMOD) $(JGEN)jpege_1 -lib $(JPEG_NAME) + + $(JGEN)jpege_0.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpege6.dev +- $(CP_) $(JGEN)jpege6.dev $(JGEN)jpege_0.dev ++ $(CP_) $(JGEN)jpege6.dev $(JGEN)jpege_0.dev || true + + jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ) + +@@ -221,90 +221,90 @@ + $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3) + + $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP) +- $(CP_) $(JSRC)jcapimin.c $(GLGEN)jcapimin.c ++ $(CP_) $(JSRC)jcapimin.c $(GLGEN)jcapimin.c || true + $(JCC) $(JO_)jcapimin.$(OBJ) $(C_) $(GLGEN)jcapimin.c + $(RM_) $(GLGEN)jcapimin.c + + $(JOBJ)jcapistd.$(OBJ) : $(JSRC)jcapistd.c $(JDEP) +- $(CP_) $(JSRC)jcapistd.c $(GLGEN)jcapistd.c ++ $(CP_) $(JSRC)jcapistd.c $(GLGEN)jcapistd.c || true + $(JCC) $(JO_)jcapistd.$(OBJ) $(C_) $(GLGEN)jcapistd.c + $(RM_) $(GLGEN)jcapistd.c + + $(JOBJ)jcinit.$(OBJ) : $(JSRC)jcinit.c $(JDEP) +- $(CP_) $(JSRC)jcinit.c $(GLGEN)jcinit.c ++ $(CP_) $(JSRC)jcinit.c $(GLGEN)jcinit.c || true + $(JCC) $(JO_)jcinit.$(OBJ) $(C_) $(GLGEN)jcinit.c + $(RM_) $(GLGEN)jcinit.c + + $(JOBJ)jccoefct.$(OBJ) : $(JSRC)jccoefct.c $(JDEP) +- $(CP_) $(JSRC)jccoefct.c $(GLGEN)jccoefct.c ++ $(CP_) $(JSRC)jccoefct.c $(GLGEN)jccoefct.c || true + $(JCC) $(JO_)jccoefct.$(OBJ) $(C_) $(GLGEN)jccoefct.c + $(RM_) $(GLGEN)jccoefct.c + + $(JOBJ)jccolor.$(OBJ) : $(JSRC)jccolor.c $(JDEP) +- $(CP_) $(JSRC)jccolor.c $(GLGEN)jccolor.c ++ $(CP_) $(JSRC)jccolor.c $(GLGEN)jccolor.c || true + $(JCC) $(JO_)jccolor.$(OBJ) $(C_) $(GLGEN)jccolor.c + $(RM_) $(GLGEN)jccolor.c + + $(JOBJ)jcdctmgr.$(OBJ) : $(JSRC)jcdctmgr.c $(JDEP) +- $(CP_) $(JSRC)jcdctmgr.c $(GLGEN)jcdctmgr.c ++ $(CP_) $(JSRC)jcdctmgr.c $(GLGEN)jcdctmgr.c || true + $(JCC) $(JO_)jcdctmgr.$(OBJ) $(C_) $(GLGEN)jcdctmgr.c + $(RM_) $(GLGEN)jcdctmgr.c + + $(JOBJ)jchuff.$(OBJ) : $(JSRC)jchuff.c $(JDEP) +- $(CP_) $(JSRC)jchuff.c $(GLGEN)jchuff.c ++ $(CP_) $(JSRC)jchuff.c $(GLGEN)jchuff.c || true + $(JCC) $(JO_)jchuff.$(OBJ) $(C_) $(GLGEN)jchuff.c + $(RM_) $(GLGEN)jchuff.c + + $(JOBJ)jcmainct.$(OBJ) : $(JSRC)jcmainct.c $(JDEP) +- $(CP_) $(JSRC)jcmainct.c $(GLGEN)jcmainct.c ++ $(CP_) $(JSRC)jcmainct.c $(GLGEN)jcmainct.c || true + $(JCC) $(JO_)jcmainct.$(OBJ) $(C_) $(GLGEN)jcmainct.c + $(RM_) $(GLGEN)jcmainct.c + + $(JOBJ)jcmarker.$(OBJ) : $(JSRC)jcmarker.c $(JDEP) +- $(CP_) $(JSRC)jcmarker.c $(GLGEN)jcmarker.c ++ $(CP_) $(JSRC)jcmarker.c $(GLGEN)jcmarker.c || true + $(JCC) $(JO_)jcmarker.$(OBJ) $(C_) $(GLGEN)jcmarker.c + $(RM_) $(GLGEN)jcmarker.c + + $(JOBJ)jcmaster.$(OBJ) : $(JSRC)jcmaster.c $(JDEP) +- $(CP_) $(JSRC)jcmaster.c $(GLGEN)jcmaster.c ++ $(CP_) $(JSRC)jcmaster.c $(GLGEN)jcmaster.c || true + $(JCC) $(JO_)jcmaster.$(OBJ) $(C_) $(GLGEN)jcmaster.c + $(RM_) $(GLGEN)jcmaster.c + + $(JOBJ)jcparam.$(OBJ) : $(JSRC)jcparam.c $(JDEP) +- $(CP_) $(JSRC)jcparam.c $(GLGEN)jcparam.c ++ $(CP_) $(JSRC)jcparam.c $(GLGEN)jcparam.c || true + $(JCC) $(JO_)jcparam.$(OBJ) $(C_) $(GLGEN)jcparam.c + $(RM_) $(GLGEN)jcparam.c + + $(JOBJ)jcprepct.$(OBJ) : $(JSRC)jcprepct.c $(JDEP) +- $(CP_) $(JSRC)jcprepct.c $(GLGEN)jcprepct.c ++ $(CP_) $(JSRC)jcprepct.c $(GLGEN)jcprepct.c || true + $(JCC) $(JO_)jcprepct.$(OBJ) $(C_) $(GLGEN)jcprepct.c + $(RM_) $(GLGEN)jcprepct.c + + $(JOBJ)jcsample.$(OBJ) : $(JSRC)jcsample.c $(JDEP) +- $(CP_) $(JSRC)jcsample.c $(GLGEN)jcsample.c ++ $(CP_) $(JSRC)jcsample.c $(GLGEN)jcsample.c || true + $(JCC) $(JO_)jcsample.$(OBJ) $(C_) $(GLGEN)jcsample.c + $(RM_) $(GLGEN)jcsample.c + + $(JOBJ)jfdctint.$(OBJ) : $(JSRC)jfdctint.c $(JDEP) +- $(CP_) $(JSRC)jfdctint.c $(GLGEN)jfdctint.c ++ $(CP_) $(JSRC)jfdctint.c $(GLGEN)jfdctint.c || true + $(JCC) $(JO_)jfdctint.$(OBJ) $(C_) $(GLGEN)jfdctint.c + $(RM_) $(GLGEN)jfdctint.c + + $(JOBJ)jcarith.$(OBJ) : $(JSRC)jcarith.c $(JDEP) +- $(CP_) $(JSRC)jcarith.c $(GLGEN)jcarith.c ++ $(CP_) $(JSRC)jcarith.c $(GLGEN)jcarith.c || true + $(JCC) $(JO_)jcarith.$(OBJ) $(C_) $(GLGEN)jcarith.c + $(RM_) $(GLGEN)jcarith.c + + # Decompression code + + $(JGEN)jpegd.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpegd_$(SHARE_JPEG).dev +- $(CP_) $(JGEN)jpegd_$(SHARE_JPEG).dev $(JGEN)jpegd.dev ++ $(CP_) $(JGEN)jpegd_$(SHARE_JPEG).dev $(JGEN)jpegd.dev || true + + $(JGEN)jpegd_1.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(ECHOGS_XE) + $(SETMOD) $(JGEN)jpegd_1 -lib $(JPEG_NAME) + + $(JGEN)jpegd_0.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpegd6.dev +- $(CP_) $(JGEN)jpegd6.dev $(JGEN)jpegd_0.dev ++ $(CP_) $(JGEN)jpegd6.dev $(JGEN)jpegd_0.dev || true + + jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ) + +@@ -320,76 +320,76 @@ + $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3) + + $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP) +- $(CP_) $(JSRC)jdapimin.c $(GLGEN)jdapimin.c ++ $(CP_) $(JSRC)jdapimin.c $(GLGEN)jdapimin.c || true + $(JCC) $(JO_)jdapimin.$(OBJ) $(C_) $(GLGEN)jdapimin.c + $(RM_) $(GLGEN)jdapimin.c + + $(JOBJ)jdapistd.$(OBJ) : $(JSRC)jdapistd.c $(JDEP) +- $(CP_) $(JSRC)jdapistd.c $(GLGEN)jdapistd.c ++ $(CP_) $(JSRC)jdapistd.c $(GLGEN)jdapistd.c || true + $(JCC) $(JO_)jdapistd.$(OBJ) $(C_) $(GLGEN)jdapistd.c + $(RM_) $(GLGEN)jdapistd.c + + $(JOBJ)jdcoefct.$(OBJ) : $(JSRC)jdcoefct.c $(JDEP) +- $(CP_) $(JSRC)jdcoefct.c $(GLGEN)jdcoefct.c ++ $(CP_) $(JSRC)jdcoefct.c $(GLGEN)jdcoefct.c || true + $(JCC) $(JO_)jdcoefct.$(OBJ) $(C_) $(GLGEN)jdcoefct.c + $(RM_) $(GLGEN)jdcoefct.c + + $(JOBJ)jdcolor.$(OBJ) : $(JSRC)jdcolor.c $(JDEP) +- $(CP_) $(JSRC)jdcolor.c $(GLGEN)jdcolor.c ++ $(CP_) $(JSRC)jdcolor.c $(GLGEN)jdcolor.c || true + $(JCC) $(JO_)jdcolor.$(OBJ) $(C_) $(GLGEN)jdcolor.c + $(RM_) $(GLGEN)jdcolor.c + + $(JOBJ)jddctmgr.$(OBJ) : $(JSRC)jddctmgr.c $(JDEP) +- $(CP_) $(JSRC)jddctmgr.c $(GLGEN)jddctmgr.c ++ $(CP_) $(JSRC)jddctmgr.c $(GLGEN)jddctmgr.c || true + $(JCC) $(JO_)jddctmgr.$(OBJ) $(C_) $(GLGEN)jddctmgr.c + $(RM_) $(GLGEN)jddctmgr.c + + $(JOBJ)jdhuff.$(OBJ) : $(JSRC)jdhuff.c $(JDEP) +- $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c ++ $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c || true + $(JCC) $(JO_)jdhuff.$(OBJ) $(C_) $(GLGEN)jdhuff.c + $(RM_) $(GLGEN)jdhuff.c + + $(JOBJ)jdinput.$(OBJ) : $(JSRC)jdinput.c $(JDEP) +- $(CP_) $(JSRC)jdinput.c $(GLGEN)jdinput.c ++ $(CP_) $(JSRC)jdinput.c $(GLGEN)jdinput.c || true + $(JCC) $(JO_)jdinput.$(OBJ) $(C_) $(GLGEN)jdinput.c + $(RM_) $(GLGEN)jdinput.c + + $(JOBJ)jdmainct.$(OBJ) : $(JSRC)jdmainct.c $(JDEP) +- $(CP_) $(JSRC)jdmainct.c $(GLGEN)jdmainct.c ++ $(CP_) $(JSRC)jdmainct.c $(GLGEN)jdmainct.c || true + $(JCC) $(JO_)jdmainct.$(OBJ) $(C_) $(GLGEN)jdmainct.c + $(RM_) $(GLGEN)jdmainct.c + + $(JOBJ)jdmarker.$(OBJ) : $(JSRC)jdmarker.c $(JDEP) +- $(CP_) $(JSRC)jdmarker.c $(GLGEN)jdmarker.c ++ $(CP_) $(JSRC)jdmarker.c $(GLGEN)jdmarker.c || true + $(JCC) $(JO_)jdmarker.$(OBJ) $(C_) $(GLGEN)jdmarker.c + $(RM_) $(GLGEN)jdmarker.c + + $(JOBJ)jdmaster.$(OBJ) : $(JSRC)jdmaster.c $(JDEP) +- $(CP_) $(JSRC)jdmaster.c $(GLGEN)jdmaster.c ++ $(CP_) $(JSRC)jdmaster.c $(GLGEN)jdmaster.c || true + $(JCC) $(JO_)jdmaster.$(OBJ) $(C_) $(GLGEN)jdmaster.c + $(RM_) $(GLGEN)jdmaster.c + + #$(JOBJ)jdhuff.$(OBJ) : $(JSRC)jdhuff.c $(JDEP) +-# $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c ++# $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c || true + # $(JCC) $(JO_)jdhuff.$(OBJ) $(C_) $(GLGEN)jdhuff.c + # $(RM_) $(GLGEN)jdhuff.c + + $(JOBJ)jdpostct.$(OBJ) : $(JSRC)jdpostct.c $(JDEP) +- $(CP_) $(JSRC)jdpostct.c $(GLGEN)jdpostct.c ++ $(CP_) $(JSRC)jdpostct.c $(GLGEN)jdpostct.c || true + $(JCC) $(JO_)jdpostct.$(OBJ) $(C_) $(GLGEN)jdpostct.c + $(RM_) $(GLGEN)jdpostct.c + + $(JOBJ)jdsample.$(OBJ) : $(JSRC)jdsample.c $(JDEP) +- $(CP_) $(JSRC)jdsample.c $(GLGEN)jdsample.c ++ $(CP_) $(JSRC)jdsample.c $(GLGEN)jdsample.c || true + $(JCC) $(JO_)jdsample.$(OBJ) $(C_) $(GLGEN)jdsample.c + $(RM_) $(GLGEN)jdsample.c + + $(JOBJ)jidctint.$(OBJ) : $(JSRC)jidctint.c $(JDEP) +- $(CP_) $(JSRC)jidctint.c $(GLGEN)jidctint.c ++ $(CP_) $(JSRC)jidctint.c $(GLGEN)jidctint.c || true + $(JCC) $(JO_)jidctint.$(OBJ) $(C_) $(GLGEN)jidctint.c + $(RM_) $(GLGEN)jidctint.c + + $(JOBJ)jdarith.$(OBJ) : $(JSRC)jdarith.c $(JDEP) +- $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c ++ $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c || true + $(JCC) $(JO_)jdarith.$(OBJ) $(C_) $(GLGEN)jdarith.c + $(RM_) $(GLGEN)jdarith.c +Index: ghostscript-9.05/base/jpegxr.mak +=================================================================== +--- ghostscript-9.05.orig/base/jpegxr.mak 2012-03-28 10:55:34.288607875 +0000 ++++ ghostscript-9.05/base/jpegxr.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -100,7 +100,7 @@ + # Copy the target definition we want + $(JPEGXR_GEN)jpegxr.dev : $(TOP_MAKEFILES) $(JPEGXR_MAK) \ + $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev +- $(CP_) $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev $(JPEGXR_GEN)jpegxr.dev ++ $(CP_) $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev $(JPEGXR_GEN)jpegxr.dev || true + + # Define the compiled in target + $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs) +Index: ghostscript-9.05/base/lcms.mak +=================================================================== +--- ghostscript-9.05.orig/base/lcms.mak 2012-03-28 10:55:34.320607874 +0000 ++++ ghostscript-9.05/base/lcms.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -83,7 +83,7 @@ + + # switch in the version of lcms.dev we're actually using + $(LCMSGEN)lcms.dev : $(TOP_MAKEFILES) $(LCMSGEN)lcms_$(SHARE_LCMS).dev +- $(CP_) $(LCMSGEN)lcms_$(SHARE_LCMS).dev $(LCMSGEN)lcms.dev ++ $(CP_) $(LCMSGEN)lcms_$(SHARE_LCMS).dev $(LCMSGEN)lcms.dev || true + + # dev file for shared (separately built) lcms library + $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/lcms2.mak +=================================================================== +--- ghostscript-9.05.orig/base/lcms2.mak 2012-03-28 10:55:34.304607874 +0000 ++++ ghostscript-9.05/base/lcms2.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -83,7 +83,7 @@ + + # switch in the version of lcms2.dev we're actually using + $(LCMS2GEN)lcms2.dev : $(TOP_MAKEFILES) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev +- $(CP_) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2.dev ++ $(CP_) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2.dev || true + + # dev file for shared (separately built) lcms library + $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/lcups.mak +=================================================================== +--- ghostscript-9.05.orig/base/lcups.mak 2012-03-28 10:55:34.352607873 +0000 ++++ ghostscript-9.05/base/lcups.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -112,7 +112,7 @@ + + # instantiate the requested build option (shared or compiled in) + $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev +- $(CP_) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev $(LIBCUPSGEN)lcups.dev ++ $(CP_) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev $(LIBCUPSGEN)lcups.dev || true + + # Define the shared version. + $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) +@@ -129,7 +129,7 @@ + # for simplicity we have every source file depend on all headers + + $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h +- $(CP_) $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h $(LIBCUPSGEN)$(D)cups$(D)config.h ++ $(CP_) $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h $(LIBCUPSGEN)$(D)cups$(D)config.h || true + + $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h + $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c +@@ -216,7 +216,7 @@ + $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c + + $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS) +- $(CP_) $(LIBCUPSSRC)md5.c $(LIBCUPSGEN)cups_md5.c ++ $(CP_) $(LIBCUPSSRC)md5.c $(LIBCUPSGEN)cups_md5.c || true + $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c + + $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS) +@@ -253,7 +253,7 @@ + $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c + + $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS) +- $(CP_) $(LIBCUPSSRC)snprintf.c $(LIBCUPSGEN)cups_snpf.c ++ $(CP_) $(LIBCUPSSRC)snprintf.c $(LIBCUPSGEN)cups_snpf.c || true + $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c + + $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS) +@@ -269,5 +269,5 @@ + $(LCUPS_CC) $(LCUPSO_)usersys.$(OBJ) $(C_) $(LIBCUPSSRC)usersys.c + + $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS) +- $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c ++ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true + $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c +Index: ghostscript-9.05/base/lcupsi.mak +=================================================================== +--- ghostscript-9.05.orig/base/lcupsi.mak 2012-03-28 10:55:34.336607873 +0000 ++++ ghostscript-9.05/base/lcupsi.mak 2012-03-28 10:55:41.856605305 +0000 +@@ -71,7 +71,7 @@ + + # instantiate the requested build option (shared or compiled in) + $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev +- $(CP_) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev $(LIBCUPSIGEN)lcupsi.dev ++ $(CP_) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev $(LIBCUPSIGEN)lcupsi.dev || true + + # Define the shared version. + $(LIBCUPSIGEN)lcupsi_1.dev : $(TOP_MAKEFILES) $(LCUPSI_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/ldf_jb2.mak +=================================================================== +--- ghostscript-9.05.orig/base/ldf_jb2.mak 2012-03-28 10:55:34.368607873 +0000 ++++ ghostscript-9.05/base/ldf_jb2.mak 2012-03-28 10:55:41.860605619 +0000 +@@ -222,7 +222,7 @@ + + # switch in the selected library .dev + $(LDF_JB2_GEN)ldf_jb2.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev +- $(CP_) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev $(LDF_JB2_GEN)ldf_jb2.dev ++ $(CP_) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev $(LDF_JB2_GEN)ldf_jb2.dev || true + + # external link .dev + $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/lwf_jp2.mak +=================================================================== +--- ghostscript-9.05.orig/base/lwf_jp2.mak 2012-03-28 10:55:34.384607872 +0000 ++++ ghostscript-9.05/base/lwf_jp2.mak 2012-03-28 10:55:41.864605914 +0000 +@@ -175,7 +175,7 @@ + + # switch in the selected library .dev + $(LWF_JP2_GEN)lwf_jp2.dev : $(TOP_MAKEFILES) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev +- $(CP_) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev $(LWF_JP2_GEN)lwf_jp2.dev ++ $(CP_) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev $(LWF_JP2_GEN)lwf_jp2.dev || true + + # external link .dev + $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/macos-mcp.mak +=================================================================== +--- ghostscript-9.05.orig/base/macos-mcp.mak 2012-03-28 10:55:34.416607872 +0000 ++++ ghostscript-9.05/base/macos-mcp.mak 2012-03-28 10:55:41.864605914 +0000 +@@ -384,11 +384,11 @@ + + $(CWPROJ_XML): $(gconfigd_h) + -mkdir -p obj/sys +- $(CP_) $(macsystypes_h) $(systypes_h) ++ $(CP_) $(macsystypes_h) $(systypes_h) || true + $(SH) $(GLSRC)macgenmcpxml.sh `$(CAT) $(ld_tr)` > $(CWPROJ_XML) +- $(CP_) $(GLSRC)gconf.c $(GLOBJ)gconfig.c +- $(CP_) $(GLSRC)iconf.c $(GLOBJ)iconfig.c +- $(CP_) $(GLSRC)gscdef.c $(GLOBJ)gscdefs.c ++ $(CP_) $(GLSRC)gconf.c $(GLOBJ)gconfig.c || true ++ $(CP_) $(GLSRC)iconf.c $(GLOBJ)iconfig.c || true ++ $(CP_) $(GLSRC)gscdef.c $(GLOBJ)gscdefs.c || true + /Developer/Tools/SetFile -c CWIE -t TEXT $(CWPROJ_XML) + + $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) +Index: ghostscript-9.05/base/openjpeg.mak +=================================================================== +--- ghostscript-9.05.orig/base/openjpeg.mak 2012-03-28 10:55:34.492607870 +0000 ++++ ghostscript-9.05/base/openjpeg.mak 2012-03-28 10:55:41.868606149 +0000 +@@ -86,11 +86,11 @@ + $(OPEN_JPEG_SRC)tgt.h \ + + $(OPEN_JPEG_CONFIG_H): $(TOP_MAKEFILES) $(JPXSRCDIR)$(D)opj_config.h.in.user +- $(CP_) $(JPXSRCDIR)$(D)opj_config.h.in.user $(OPEN_JPEG_CONFIG_H) ++ $(CP_) $(JPXSRCDIR)$(D)opj_config.h.in.user $(OPEN_JPEG_CONFIG_H) || true + + # switch in the selected library .dev + $(OPEN_JPEG_GEN)openjpeg.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev +- $(CP_) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev $(OPEN_JPEG_GEN)openjpeg.dev ++ $(CP_) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev $(OPEN_JPEG_GEN)openjpeg.dev || true + + # external link .dev + $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) +Index: ghostscript-9.05/base/openvms.mak +=================================================================== +--- ghostscript-9.05.orig/base/openvms.mak 2012-03-28 10:55:34.508607869 +0000 ++++ ghostscript-9.05/base/openvms.mak 2012-03-28 10:55:41.868606149 +0000 +@@ -364,7 +364,7 @@ + + # Define generic commands. + +-CP_=$$ @$(GLSRCDIR)COPY_ONE ++CP_=$$ @$(GLSRCDIR)COPY_ONE || true + + # Define the command for deleting (a) file(s) (including wild cards) + +Index: ghostscript-9.05/base/png.mak +=================================================================== +--- ghostscript-9.05.orig/base/png.mak 2012-03-28 10:55:34.540607869 +0000 ++++ ghostscript-9.05/base/png.mak 2012-03-28 10:55:41.868606149 +0000 +@@ -123,7 +123,7 @@ + + # Define the version of libpng.dev that we are actually using. + $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev +- $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev ++ $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev || true + + # Define the shared version of libpng. + # Note that it requires libz, which must be searched *after* libpng. +Index: ghostscript-9.05/base/tiff.mak +=================================================================== +--- ghostscript-9.05.orig/base/tiff.mak 2012-03-28 10:55:34.556607868 +0000 ++++ ghostscript-9.05/base/tiff.mak 2012-03-28 10:55:41.868606149 +0000 +@@ -48,11 +48,11 @@ + + $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in + cd $(TIFFSRC) && ./configure +- $(CP_) $(TIFFSRC)libtiff$(D)tif_config.h $(TIFFSRC)libtiff$(D)tif_config.unix.h ++ $(CP_) $(TIFFSRC)libtiff$(D)tif_config.h $(TIFFSRC)libtiff$(D)tif_config.unix.h || true + + $(TIFFSRC)libtiff$(D)tiffconf.unix.h : $(TIFFSRC)libtiff$(D)tiffconf.h.in + cd $(TIFFSRC) && ./configure +- $(CP_) $(TIFFSRC)libtiff$(D)tiffconf.h $(TIFFSRC)libtiff$(D)tiffconf.unix.h ++ $(CP_) $(TIFFSRC)libtiff$(D)tiffconf.h $(TIFFSRC)libtiff$(D)tiffconf.unix.h || true + + $(TIFFOBJ)tif_aux.$(OBJ) : $(TIFFSRC)/libtiff/tif_aux.c $(TIFFDEP) + $(TIFFCC) $(TIFFO_)tif_aux.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_aux.c +@@ -178,14 +178,14 @@ + $(TIFFCC) $(TIFFO_)tif_unix.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_unix.c + + $(TIFFGEN)tif_config.h: $(TIFFCONFIG) +- $(CP_) $(TIFFCONFIG) $(TIFFGEN)tif_config.h ++ $(CP_) $(TIFFCONFIG) $(TIFFGEN)tif_config.h || true + + $(TIFFGEN)tiffconf.h: $(TIFFCONF) +- $(CP_) $(TIFFCONF) $(TIFFGEN)tiffconf.h ++ $(CP_) $(TIFFCONF) $(TIFFGEN)tiffconf.h || true + + # Define the version of libtiff.dev that we are actually using. + $(TIFFGEN)libtiff.dev : $(TOP_MAKEFILES) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev +- $(CP_) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev $(TIFFGEN)libtiff.dev ++ $(CP_) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev $(TIFFGEN)libtiff.dev || true + + + # Define the shared version. +Index: ghostscript-9.05/base/unix-aux.mak +=================================================================== +--- ghostscript-9.05.orig/base/unix-aux.mak 2012-03-28 10:55:34.604607867 +0000 ++++ ghostscript-9.05/base/unix-aux.mak 2012-03-28 10:55:41.868606149 +0000 +@@ -105,7 +105,7 @@ + # $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) + # + #$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) +-# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) ++# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) || true + + # Query the environment to construct gconfig_.h. + # The "else true;" is required because Ultrix's implementation of sh -e +Index: ghostscript-9.05/base/zlib.mak +=================================================================== +--- ghostscript-9.05.orig/base/zlib.mak 2012-03-28 10:55:34.744607864 +0000 ++++ ghostscript-9.05/base/zlib.mak 2012-03-28 10:55:41.872606358 +0000 +@@ -82,7 +82,7 @@ + # Encoding (compression) code. + + $(ZGEN)zlibe.dev : $(TOP_MAKEFILES) $(ZGEN)zlibe_$(SHARE_ZLIB).dev +- $(CP_) $(ZGEN)zlibe_$(SHARE_ZLIB).dev $(ZGEN)zlibe.dev ++ $(CP_) $(ZGEN)zlibe_$(SHARE_ZLIB).dev $(ZGEN)zlibe.dev || true + + $(ZGEN)zlibe_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) + $(SETMOD) $(ZGEN)zlibe_1 -lib $(ZLIB_NAME) +@@ -110,7 +110,7 @@ + # with 0.90 do. + + $(ZGEN)crc32.dev : $(TOP_MAKEFILES) $(ZGEN)crc32_$(SHARE_ZLIB).dev +- $(CP_) $(ZGEN)crc32_$(SHARE_ZLIB).dev $(ZGEN)crc32.dev ++ $(CP_) $(ZGEN)crc32_$(SHARE_ZLIB).dev $(ZGEN)crc32.dev || true + + $(ZGEN)crc32_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) + $(SETMOD) $(ZGEN)crc32_1 -lib $(ZLIB_NAME) +@@ -126,7 +126,7 @@ + # Decoding (decompression) code. + + $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev +- $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev ++ $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev || true + + $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) + $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb index 67b1cf732..6fc9f572e 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 = "" |