diff options
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch | 134 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.05.bb | 2 |
2 files changed, 89 insertions, 47 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 8491053f95..7b72023741 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 | |||
| @@ -11,8 +11,8 @@ RP: Extended || true to all CP_ operations, they all can race e.g.: | |||
| 11 | 11 | ||
| 12 | Index: ghostscript-9.05/base/unixhead.mak | 12 | Index: ghostscript-9.05/base/unixhead.mak |
| 13 | =================================================================== | 13 | =================================================================== |
| 14 | --- ghostscript-9.05.orig/base/unixhead.mak 2012-03-28 10:55:23.804608117 +0000 | 14 | --- ghostscript-9.05.orig/base/unixhead.mak 2012-03-29 08:27:46.458812172 +0000 |
| 15 | +++ ghostscript-9.05/base/unixhead.mak 2012-03-28 10:56:47.544606075 +0000 | 15 | +++ ghostscript-9.05/base/unixhead.mak 2012-03-29 08:27:52.526811946 +0000 |
| 16 | @@ -54,7 +54,7 @@ | 16 | @@ -54,7 +54,7 @@ |
| 17 | 17 | ||
| 18 | # Define generic commands. | 18 | # Define generic commands. |
| @@ -24,8 +24,8 @@ Index: ghostscript-9.05/base/unixhead.mak | |||
| 24 | 24 | ||
| 25 | Index: ghostscript-9.05/base/lib.mak | 25 | Index: ghostscript-9.05/base/lib.mak |
| 26 | =================================================================== | 26 | =================================================================== |
| 27 | --- ghostscript-9.05.orig/base/lib.mak 2012-03-28 10:55:23.816608117 +0000 | 27 | --- ghostscript-9.05.orig/base/lib.mak 2012-03-29 08:27:46.470812164 +0000 |
| 28 | +++ ghostscript-9.05/base/lib.mak 2012-03-28 10:55:41.864605914 +0000 | 28 | +++ ghostscript-9.05/base/lib.mak 2012-03-29 08:27:52.526811946 +0000 |
| 29 | @@ -327,7 +327,7 @@ | 29 | @@ -327,7 +327,7 @@ |
| 30 | $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE) | 30 | $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE) |
| 31 | $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22 | 31 | $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22 |
| @@ -43,8 +43,8 @@ Index: ghostscript-9.05/base/lib.mak | |||
| 43 | - $(RM_) $(GLGEN)gconfig.h | 43 | - $(RM_) $(GLGEN)gconfig.h |
| 44 | - $(CP_) $(gconfig_h) $(GLGEN)gconfig.h | 44 | - $(CP_) $(gconfig_h) $(GLGEN)gconfig.h |
| 45 | - $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c | 45 | - $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c |
| 46 | + $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true || true | 46 | + $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true |
| 47 | + $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true || true | 47 | + $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true |
| 48 | $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c | 48 | $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c |
| 49 | 49 | ||
| 50 | $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\ | 50 | $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\ |
| @@ -217,8 +217,8 @@ Index: ghostscript-9.05/base/lib.mak | |||
| 217 | $(GLCC) $(GLO_)gsromfs1.$(OBJ) $(C_) $(GLOBJ)gsromfs1.c | 217 | $(GLCC) $(GLO_)gsromfs1.$(OBJ) $(C_) $(GLOBJ)gsromfs1.c |
| 218 | Index: ghostscript-9.05/base/expat.mak | 218 | Index: ghostscript-9.05/base/expat.mak |
| 219 | =================================================================== | 219 | =================================================================== |
| 220 | --- ghostscript-9.05.orig/base/expat.mak 2012-03-28 10:55:34.164607877 +0000 | 220 | --- ghostscript-9.05.orig/base/expat.mak 2012-02-08 08:48:48.000000000 +0000 |
| 221 | +++ ghostscript-9.05/base/expat.mak 2012-03-28 10:55:41.852604931 +0000 | 221 | +++ ghostscript-9.05/base/expat.mak 2012-03-29 08:27:52.554812021 +0000 |
| 222 | @@ -81,7 +81,7 @@ | 222 | @@ -81,7 +81,7 @@ |
| 223 | # Copy the target definition we want | 223 | # Copy the target definition we want |
| 224 | $(EXPATGEN)expat.dev : $(TOP_MAKEFILES) $(EXPAT_MAK) \ | 224 | $(EXPATGEN)expat.dev : $(TOP_MAKEFILES) $(EXPAT_MAK) \ |
| @@ -230,8 +230,8 @@ Index: ghostscript-9.05/base/expat.mak | |||
| 230 | $(EXPATGEN)expat_0.dev : $(EXPAT_MAK) $(ECHOGS_XE) $(expat_) | 230 | $(EXPATGEN)expat_0.dev : $(EXPAT_MAK) $(ECHOGS_XE) $(expat_) |
| 231 | Index: ghostscript-9.05/base/freetype.mak | 231 | Index: ghostscript-9.05/base/freetype.mak |
| 232 | =================================================================== | 232 | =================================================================== |
| 233 | --- ghostscript-9.05.orig/base/freetype.mak 2012-03-28 10:55:34.180607877 +0000 | 233 | --- ghostscript-9.05.orig/base/freetype.mak 2012-02-08 08:48:48.000000000 +0000 |
| 234 | +++ ghostscript-9.05/base/freetype.mak 2012-03-28 10:55:41.852604931 +0000 | 234 | +++ ghostscript-9.05/base/freetype.mak 2012-03-29 08:27:52.566812025 +0000 |
| 235 | @@ -193,7 +193,7 @@ | 235 | @@ -193,7 +193,7 @@ |
| 236 | 236 | ||
| 237 | # instantiate the requested build option (shared or compiled in) | 237 | # instantiate the requested build option (shared or compiled in) |
| @@ -243,8 +243,8 @@ Index: ghostscript-9.05/base/freetype.mak | |||
| 243 | $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) | 243 | $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) |
| 244 | Index: ghostscript-9.05/base/ijs.mak | 244 | Index: ghostscript-9.05/base/ijs.mak |
| 245 | =================================================================== | 245 | =================================================================== |
| 246 | --- ghostscript-9.05.orig/base/ijs.mak 2012-03-28 10:55:34.224607876 +0000 | 246 | --- ghostscript-9.05.orig/base/ijs.mak 2012-02-08 08:48:48.000000000 +0000 |
| 247 | +++ ghostscript-9.05/base/ijs.mak 2012-03-28 10:55:41.856605305 +0000 | 247 | +++ ghostscript-9.05/base/ijs.mak 2012-03-29 08:27:52.574812030 +0000 |
| 248 | @@ -64,7 +64,7 @@ | 248 | @@ -64,7 +64,7 @@ |
| 249 | 249 | ||
| 250 | 250 | ||
| @@ -256,8 +256,8 @@ Index: ghostscript-9.05/base/ijs.mak | |||
| 256 | ijs_h=$(IJSSRC)ijs.h | 256 | ijs_h=$(IJSSRC)ijs.h |
| 257 | Index: ghostscript-9.05/base/jasper.mak | 257 | Index: ghostscript-9.05/base/jasper.mak |
| 258 | =================================================================== | 258 | =================================================================== |
| 259 | --- ghostscript-9.05.orig/base/jasper.mak 2012-03-28 10:55:34.240607876 +0000 | 259 | --- ghostscript-9.05.orig/base/jasper.mak 2012-02-08 08:48:48.000000000 +0000 |
| 260 | +++ ghostscript-9.05/base/jasper.mak 2012-03-28 10:55:41.856605305 +0000 | 260 | +++ ghostscript-9.05/base/jasper.mak 2012-03-29 08:27:52.582812027 +0000 |
| 261 | @@ -164,7 +164,7 @@ | 261 | @@ -164,7 +164,7 @@ |
| 262 | 262 | ||
| 263 | # switch in the selected .dev | 263 | # switch in the selected .dev |
| @@ -269,8 +269,8 @@ Index: ghostscript-9.05/base/jasper.mak | |||
| 269 | $(JASGEN)jasper_1.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE) | 269 | $(JASGEN)jasper_1.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE) |
| 270 | Index: ghostscript-9.05/base/jbig2.mak | 270 | Index: ghostscript-9.05/base/jbig2.mak |
| 271 | =================================================================== | 271 | =================================================================== |
| 272 | --- ghostscript-9.05.orig/base/jbig2.mak 2012-03-28 10:55:34.256607875 +0000 | 272 | --- ghostscript-9.05.orig/base/jbig2.mak 2012-02-08 08:48:47.000000000 +0000 |
| 273 | +++ ghostscript-9.05/base/jbig2.mak 2012-03-28 10:55:41.856605305 +0000 | 273 | +++ ghostscript-9.05/base/jbig2.mak 2012-03-29 08:27:52.590812023 +0000 |
| 274 | @@ -96,7 +96,7 @@ | 274 | @@ -96,7 +96,7 @@ |
| 275 | 275 | ||
| 276 | # switch in the version of libjbig2.dev we're actually using | 276 | # switch in the version of libjbig2.dev we're actually using |
| @@ -282,8 +282,8 @@ Index: ghostscript-9.05/base/jbig2.mak | |||
| 282 | $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE) | 282 | $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE) |
| 283 | Index: ghostscript-9.05/base/jpeg.mak | 283 | Index: ghostscript-9.05/base/jpeg.mak |
| 284 | =================================================================== | 284 | =================================================================== |
| 285 | --- ghostscript-9.05.orig/base/jpeg.mak 2012-03-28 10:55:34.272607875 +0000 | 285 | --- ghostscript-9.05.orig/base/jpeg.mak 2012-02-08 08:48:48.000000000 +0000 |
| 286 | +++ ghostscript-9.05/base/jpeg.mak 2012-03-28 10:55:41.856605305 +0000 | 286 | +++ ghostscript-9.05/base/jpeg.mak 2012-03-29 08:27:52.602812026 +0000 |
| 287 | @@ -94,7 +94,7 @@ | 287 | @@ -94,7 +94,7 @@ |
| 288 | jmorecfg_h=$(GLGEN)jmorecfg.h | 288 | jmorecfg_h=$(GLGEN)jmorecfg.h |
| 289 | 289 | ||
| @@ -601,8 +601,8 @@ Index: ghostscript-9.05/base/jpeg.mak | |||
| 601 | $(RM_) $(GLGEN)jdarith.c | 601 | $(RM_) $(GLGEN)jdarith.c |
| 602 | Index: ghostscript-9.05/base/jpegxr.mak | 602 | Index: ghostscript-9.05/base/jpegxr.mak |
| 603 | =================================================================== | 603 | =================================================================== |
| 604 | --- ghostscript-9.05.orig/base/jpegxr.mak 2012-03-28 10:55:34.288607875 +0000 | 604 | --- ghostscript-9.05.orig/base/jpegxr.mak 2012-02-08 08:48:48.000000000 +0000 |
| 605 | +++ ghostscript-9.05/base/jpegxr.mak 2012-03-28 10:55:41.856605305 +0000 | 605 | +++ ghostscript-9.05/base/jpegxr.mak 2012-03-29 08:27:52.606812026 +0000 |
| 606 | @@ -100,7 +100,7 @@ | 606 | @@ -100,7 +100,7 @@ |
| 607 | # Copy the target definition we want | 607 | # Copy the target definition we want |
| 608 | $(JPEGXR_GEN)jpegxr.dev : $(TOP_MAKEFILES) $(JPEGXR_MAK) \ | 608 | $(JPEGXR_GEN)jpegxr.dev : $(TOP_MAKEFILES) $(JPEGXR_MAK) \ |
| @@ -614,8 +614,8 @@ Index: ghostscript-9.05/base/jpegxr.mak | |||
| 614 | $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs) | 614 | $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs) |
| 615 | Index: ghostscript-9.05/base/lcms.mak | 615 | Index: ghostscript-9.05/base/lcms.mak |
| 616 | =================================================================== | 616 | =================================================================== |
| 617 | --- ghostscript-9.05.orig/base/lcms.mak 2012-03-28 10:55:34.320607874 +0000 | 617 | --- ghostscript-9.05.orig/base/lcms.mak 2012-02-08 08:48:48.000000000 +0000 |
| 618 | +++ ghostscript-9.05/base/lcms.mak 2012-03-28 10:55:41.856605305 +0000 | 618 | +++ ghostscript-9.05/base/lcms.mak 2012-03-29 08:27:52.614812023 +0000 |
| 619 | @@ -83,7 +83,7 @@ | 619 | @@ -83,7 +83,7 @@ |
| 620 | 620 | ||
| 621 | # switch in the version of lcms.dev we're actually using | 621 | # switch in the version of lcms.dev we're actually using |
| @@ -627,8 +627,8 @@ Index: ghostscript-9.05/base/lcms.mak | |||
| 627 | $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE) | 627 | $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE) |
| 628 | Index: ghostscript-9.05/base/lcms2.mak | 628 | Index: ghostscript-9.05/base/lcms2.mak |
| 629 | =================================================================== | 629 | =================================================================== |
| 630 | --- ghostscript-9.05.orig/base/lcms2.mak 2012-03-28 10:55:34.304607874 +0000 | 630 | --- ghostscript-9.05.orig/base/lcms2.mak 2012-02-08 08:48:48.000000000 +0000 |
| 631 | +++ ghostscript-9.05/base/lcms2.mak 2012-03-28 10:55:41.856605305 +0000 | 631 | +++ ghostscript-9.05/base/lcms2.mak 2012-03-29 08:27:52.626812023 +0000 |
| 632 | @@ -83,7 +83,7 @@ | 632 | @@ -83,7 +83,7 @@ |
| 633 | 633 | ||
| 634 | # switch in the version of lcms2.dev we're actually using | 634 | # switch in the version of lcms2.dev we're actually using |
| @@ -640,8 +640,8 @@ Index: ghostscript-9.05/base/lcms2.mak | |||
| 640 | $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE) | 640 | $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE) |
| 641 | Index: ghostscript-9.05/base/lcups.mak | 641 | Index: ghostscript-9.05/base/lcups.mak |
| 642 | =================================================================== | 642 | =================================================================== |
| 643 | --- ghostscript-9.05.orig/base/lcups.mak 2012-03-28 10:55:34.352607873 +0000 | 643 | --- ghostscript-9.05.orig/base/lcups.mak 2012-02-08 08:48:48.000000000 +0000 |
| 644 | +++ ghostscript-9.05/base/lcups.mak 2012-03-28 10:55:41.856605305 +0000 | 644 | +++ ghostscript-9.05/base/lcups.mak 2012-03-29 08:27:52.630812023 +0000 |
| 645 | @@ -112,7 +112,7 @@ | 645 | @@ -112,7 +112,7 @@ |
| 646 | 646 | ||
| 647 | # instantiate the requested build option (shared or compiled in) | 647 | # instantiate the requested build option (shared or compiled in) |
| @@ -687,8 +687,8 @@ Index: ghostscript-9.05/base/lcups.mak | |||
| 687 | $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c | 687 | $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c |
| 688 | Index: ghostscript-9.05/base/lcupsi.mak | 688 | Index: ghostscript-9.05/base/lcupsi.mak |
| 689 | =================================================================== | 689 | =================================================================== |
| 690 | --- ghostscript-9.05.orig/base/lcupsi.mak 2012-03-28 10:55:34.336607873 +0000 | 690 | --- ghostscript-9.05.orig/base/lcupsi.mak 2012-02-08 08:48:48.000000000 +0000 |
| 691 | +++ ghostscript-9.05/base/lcupsi.mak 2012-03-28 10:55:41.856605305 +0000 | 691 | +++ ghostscript-9.05/base/lcupsi.mak 2012-03-29 08:27:52.642812024 +0000 |
| 692 | @@ -71,7 +71,7 @@ | 692 | @@ -71,7 +71,7 @@ |
| 693 | 693 | ||
| 694 | # instantiate the requested build option (shared or compiled in) | 694 | # instantiate the requested build option (shared or compiled in) |
| @@ -700,8 +700,8 @@ Index: ghostscript-9.05/base/lcupsi.mak | |||
| 700 | $(LIBCUPSIGEN)lcupsi_1.dev : $(TOP_MAKEFILES) $(LCUPSI_MAK) $(ECHOGS_XE) | 700 | $(LIBCUPSIGEN)lcupsi_1.dev : $(TOP_MAKEFILES) $(LCUPSI_MAK) $(ECHOGS_XE) |
| 701 | Index: ghostscript-9.05/base/ldf_jb2.mak | 701 | Index: ghostscript-9.05/base/ldf_jb2.mak |
| 702 | =================================================================== | 702 | =================================================================== |
| 703 | --- ghostscript-9.05.orig/base/ldf_jb2.mak 2012-03-28 10:55:34.368607873 +0000 | 703 | --- ghostscript-9.05.orig/base/ldf_jb2.mak 2012-02-08 08:48:48.000000000 +0000 |
| 704 | +++ ghostscript-9.05/base/ldf_jb2.mak 2012-03-28 10:55:41.860605619 +0000 | 704 | +++ ghostscript-9.05/base/ldf_jb2.mak 2012-03-29 08:27:52.650812024 +0000 |
| 705 | @@ -222,7 +222,7 @@ | 705 | @@ -222,7 +222,7 @@ |
| 706 | 706 | ||
| 707 | # switch in the selected library .dev | 707 | # switch in the selected library .dev |
| @@ -713,8 +713,8 @@ Index: ghostscript-9.05/base/ldf_jb2.mak | |||
| 713 | $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) | 713 | $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) |
| 714 | Index: ghostscript-9.05/base/lwf_jp2.mak | 714 | Index: ghostscript-9.05/base/lwf_jp2.mak |
| 715 | =================================================================== | 715 | =================================================================== |
| 716 | --- ghostscript-9.05.orig/base/lwf_jp2.mak 2012-03-28 10:55:34.384607872 +0000 | 716 | --- ghostscript-9.05.orig/base/lwf_jp2.mak 2012-02-08 08:48:48.000000000 +0000 |
| 717 | +++ ghostscript-9.05/base/lwf_jp2.mak 2012-03-28 10:55:41.864605914 +0000 | 717 | +++ ghostscript-9.05/base/lwf_jp2.mak 2012-03-29 08:27:52.654812024 +0000 |
| 718 | @@ -175,7 +175,7 @@ | 718 | @@ -175,7 +175,7 @@ |
| 719 | 719 | ||
| 720 | # switch in the selected library .dev | 720 | # switch in the selected library .dev |
| @@ -726,8 +726,8 @@ Index: ghostscript-9.05/base/lwf_jp2.mak | |||
| 726 | $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) | 726 | $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) |
| 727 | Index: ghostscript-9.05/base/macos-mcp.mak | 727 | Index: ghostscript-9.05/base/macos-mcp.mak |
| 728 | =================================================================== | 728 | =================================================================== |
| 729 | --- ghostscript-9.05.orig/base/macos-mcp.mak 2012-03-28 10:55:34.416607872 +0000 | 729 | --- ghostscript-9.05.orig/base/macos-mcp.mak 2012-02-08 08:48:48.000000000 +0000 |
| 730 | +++ ghostscript-9.05/base/macos-mcp.mak 2012-03-28 10:55:41.864605914 +0000 | 730 | +++ ghostscript-9.05/base/macos-mcp.mak 2012-03-29 08:27:52.662812024 +0000 |
| 731 | @@ -384,11 +384,11 @@ | 731 | @@ -384,11 +384,11 @@ |
| 732 | 732 | ||
| 733 | $(CWPROJ_XML): $(gconfigd_h) | 733 | $(CWPROJ_XML): $(gconfigd_h) |
| @@ -746,8 +746,8 @@ Index: ghostscript-9.05/base/macos-mcp.mak | |||
| 746 | $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) | 746 | $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) |
| 747 | Index: ghostscript-9.05/base/openjpeg.mak | 747 | Index: ghostscript-9.05/base/openjpeg.mak |
| 748 | =================================================================== | 748 | =================================================================== |
| 749 | --- ghostscript-9.05.orig/base/openjpeg.mak 2012-03-28 10:55:34.492607870 +0000 | 749 | --- ghostscript-9.05.orig/base/openjpeg.mak 2012-02-08 08:48:48.000000000 +0000 |
| 750 | +++ ghostscript-9.05/base/openjpeg.mak 2012-03-28 10:55:41.868606149 +0000 | 750 | +++ ghostscript-9.05/base/openjpeg.mak 2012-03-29 08:27:52.662812024 +0000 |
| 751 | @@ -86,11 +86,11 @@ | 751 | @@ -86,11 +86,11 @@ |
| 752 | $(OPEN_JPEG_SRC)tgt.h \ | 752 | $(OPEN_JPEG_SRC)tgt.h \ |
| 753 | 753 | ||
| @@ -764,8 +764,8 @@ Index: ghostscript-9.05/base/openjpeg.mak | |||
| 764 | $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) | 764 | $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) |
| 765 | Index: ghostscript-9.05/base/openvms.mak | 765 | Index: ghostscript-9.05/base/openvms.mak |
| 766 | =================================================================== | 766 | =================================================================== |
| 767 | --- ghostscript-9.05.orig/base/openvms.mak 2012-03-28 10:55:34.508607869 +0000 | 767 | --- ghostscript-9.05.orig/base/openvms.mak 2012-02-08 08:48:47.000000000 +0000 |
| 768 | +++ ghostscript-9.05/base/openvms.mak 2012-03-28 10:55:41.868606149 +0000 | 768 | +++ ghostscript-9.05/base/openvms.mak 2012-03-29 08:27:52.674812022 +0000 |
| 769 | @@ -364,7 +364,7 @@ | 769 | @@ -364,7 +364,7 @@ |
| 770 | 770 | ||
| 771 | # Define generic commands. | 771 | # Define generic commands. |
| @@ -777,8 +777,8 @@ Index: ghostscript-9.05/base/openvms.mak | |||
| 777 | 777 | ||
| 778 | Index: ghostscript-9.05/base/png.mak | 778 | Index: ghostscript-9.05/base/png.mak |
| 779 | =================================================================== | 779 | =================================================================== |
| 780 | --- ghostscript-9.05.orig/base/png.mak 2012-03-28 10:55:34.540607869 +0000 | 780 | --- ghostscript-9.05.orig/base/png.mak 2012-02-08 08:48:48.000000000 +0000 |
| 781 | +++ ghostscript-9.05/base/png.mak 2012-03-28 10:55:41.868606149 +0000 | 781 | +++ ghostscript-9.05/base/png.mak 2012-03-29 08:27:52.674812022 +0000 |
| 782 | @@ -123,7 +123,7 @@ | 782 | @@ -123,7 +123,7 @@ |
| 783 | 783 | ||
| 784 | # Define the version of libpng.dev that we are actually using. | 784 | # Define the version of libpng.dev that we are actually using. |
| @@ -790,8 +790,8 @@ Index: ghostscript-9.05/base/png.mak | |||
| 790 | # Note that it requires libz, which must be searched *after* libpng. | 790 | # Note that it requires libz, which must be searched *after* libpng. |
| 791 | Index: ghostscript-9.05/base/tiff.mak | 791 | Index: ghostscript-9.05/base/tiff.mak |
| 792 | =================================================================== | 792 | =================================================================== |
| 793 | --- ghostscript-9.05.orig/base/tiff.mak 2012-03-28 10:55:34.556607868 +0000 | 793 | --- ghostscript-9.05.orig/base/tiff.mak 2012-02-08 08:48:48.000000000 +0000 |
| 794 | +++ ghostscript-9.05/base/tiff.mak 2012-03-28 10:55:41.868606149 +0000 | 794 | +++ ghostscript-9.05/base/tiff.mak 2012-03-29 08:27:52.674812022 +0000 |
| 795 | @@ -48,11 +48,11 @@ | 795 | @@ -48,11 +48,11 @@ |
| 796 | 796 | ||
| 797 | $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in | 797 | $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in |
| @@ -826,8 +826,8 @@ Index: ghostscript-9.05/base/tiff.mak | |||
| 826 | # Define the shared version. | 826 | # Define the shared version. |
| 827 | Index: ghostscript-9.05/base/unix-aux.mak | 827 | Index: ghostscript-9.05/base/unix-aux.mak |
| 828 | =================================================================== | 828 | =================================================================== |
| 829 | --- ghostscript-9.05.orig/base/unix-aux.mak 2012-03-28 10:55:34.604607867 +0000 | 829 | --- ghostscript-9.05.orig/base/unix-aux.mak 2012-03-21 17:51:12.106037764 +0000 |
| 830 | +++ ghostscript-9.05/base/unix-aux.mak 2012-03-28 10:55:41.868606149 +0000 | 830 | +++ ghostscript-9.05/base/unix-aux.mak 2012-03-29 08:27:52.674812022 +0000 |
| 831 | @@ -105,7 +105,7 @@ | 831 | @@ -105,7 +105,7 @@ |
| 832 | # $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) | 832 | # $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) |
| 833 | # | 833 | # |
| @@ -839,8 +839,8 @@ Index: ghostscript-9.05/base/unix-aux.mak | |||
| 839 | # The "else true;" is required because Ultrix's implementation of sh -e | 839 | # The "else true;" is required because Ultrix's implementation of sh -e |
| 840 | Index: ghostscript-9.05/base/zlib.mak | 840 | Index: ghostscript-9.05/base/zlib.mak |
| 841 | =================================================================== | 841 | =================================================================== |
| 842 | --- ghostscript-9.05.orig/base/zlib.mak 2012-03-28 10:55:34.744607864 +0000 | 842 | --- ghostscript-9.05.orig/base/zlib.mak 2012-02-08 08:48:47.000000000 +0000 |
| 843 | +++ ghostscript-9.05/base/zlib.mak 2012-03-28 10:55:41.872606358 +0000 | 843 | +++ ghostscript-9.05/base/zlib.mak 2012-03-29 08:27:52.678812021 +0000 |
| 844 | @@ -82,7 +82,7 @@ | 844 | @@ -82,7 +82,7 @@ |
| 845 | # Encoding (compression) code. | 845 | # Encoding (compression) code. |
| 846 | 846 | ||
| @@ -868,3 +868,45 @@ Index: ghostscript-9.05/base/zlib.mak | |||
| 868 | 868 | ||
| 869 | $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) | 869 | $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) |
| 870 | $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) | 870 | $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) |
| 871 | Index: ghostscript-9.05/psi/int.mak | ||
| 872 | =================================================================== | ||
| 873 | --- ghostscript-9.05.orig/psi/int.mak 2012-03-29 08:28:53.942810602 +0000 | ||
| 874 | +++ ghostscript-9.05/psi/int.mak 2012-03-29 08:29:05.814797444 +0000 | ||
| 875 | @@ -272,8 +272,8 @@ | ||
| 876 | $(gconf_h) $(gconfigd_h) $(gsmemory_h) $(gstypes_h)\ | ||
| 877 | $(iminst_h) $(iref_h) $(ivmspace_h) $(opdef_h) $(iplugin_h) | ||
| 878 | $(RM_) $(PSGEN)iconfig.c | ||
| 879 | - $(CP_) $(gconfig_h) $(PSGEN)gconfig.h | ||
| 880 | - $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c | ||
| 881 | + $(CP_) $(gconfig_h) $(PSGEN)gconfig.h || true | ||
| 882 | + $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c || true | ||
| 883 | $(PSCC) $(PSO_)iconfig.$(OBJ) $(C_) $(PSGEN)iconfig.c | ||
| 884 | |||
| 885 | $(PSOBJ)iinit.$(OBJ) : $(PSSRC)iinit.c $(GH) $(string__h)\ | ||
| 886 | @@ -605,7 +605,7 @@ | ||
| 887 | |||
| 888 | # We keep the old name for backward compatibility. | ||
| 889 | $(PSD)level1.dev : $(PSD)psl1.dev | ||
| 890 | - $(CP_) $(PSD)psl1.dev $(PSD)level1.dev | ||
| 891 | + $(CP_) $(PSD)psl1.dev $(PSD)level1.dev || true | ||
| 892 | |||
| 893 | $(PSD)psl1.dev : $(INT_MAK) $(ECHOGS_XE)\ | ||
| 894 | $(PSD)psbase.dev $(PSD)bcp.dev $(PSD)path1.dev $(PSD)type1.dev | ||
| 895 | @@ -931,7 +931,7 @@ | ||
| 896 | |||
| 897 | # We keep the old name for backward compatibility. | ||
| 898 | $(PSD)level2.dev : $(PSD)psl2.dev | ||
| 899 | - $(CP_) $(PSD)psl2.dev $(PSD)level2.dev | ||
| 900 | + $(CP_) $(PSD)psl2.dev $(PSD)level2.dev || true | ||
| 901 | |||
| 902 | # We -include dpsand2 first so that geninit will have access to the | ||
| 903 | # system name table as soon as possible. | ||
| 904 | @@ -1205,7 +1205,7 @@ | ||
| 905 | # this can be turned on and off with a FEATURE_DEV | ||
| 906 | |||
| 907 | $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev | ||
| 908 | - $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev | ||
| 909 | + $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev || true | ||
| 910 | |||
| 911 | fjpx_jasper=$(PSOBJ)zfjpx.$(OBJ) | ||
| 912 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb index 6fc9f572e8..dc6e481515 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" | |||
| 15 | LICENSE = "GPLv3" | 15 | LICENSE = "GPLv3" |
| 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" |
| 17 | 17 | ||
| 18 | PR = "r1" | 18 | PR = "r2" |
| 19 | 19 | ||
| 20 | DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" | 20 | DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" |
| 21 | DEPENDS_virtclass-native = "" | 21 | DEPENDS_virtclass-native = "" |
