summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch852
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.05.bb2
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 bb0c41c40c..8491053f95 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
5 5
6Signed-off-by: Kang Kai <kai.kang@windriver.com> 6Signed-off-by: Kang Kai <kai.kang@windriver.com>
7 7
8RP: Tweaked to include lib.mak fixes 8RP: Extended || true to all CP_ operations, they all can race e.g.:
9--- ghostscript-9.02/base/unixhead.mak.orig 2011-07-27 17:06:17.749456100 +0800 9| cp -f ./obj/gconfxx.h ./obj/gconfig.h
10+++ ghostscript-9.02/base/unixhead.mak 2011-07-27 17:06:37.449456100 +0800 10| cp: cannot create regular file `./obj/gconfig.h': File exists
11
12Index: ghostscript-9.05/base/unixhead.mak
13===================================================================
14--- ghostscript-9.05.orig/base/unixhead.mak 2012-03-28 10:55:23.804608117 +0000
15+++ ghostscript-9.05/base/unixhead.mak 2012-03-28 10:56:47.544606075 +0000
11@@ -54,7 +54,7 @@ 16@@ -54,7 +54,7 @@
12 17
13 # Define generic commands. 18 # Define generic commands.
@@ -17,11 +22,20 @@ RP: Tweaked to include lib.mak fixes
17 RM_=rm -f 22 RM_=rm -f
18 RMN_=rm -f 23 RMN_=rm -f
19 24
20Index: ghostscript-9.04/base/lib.mak 25Index: ghostscript-9.05/base/lib.mak
21=================================================================== 26===================================================================
22--- ghostscript-9.04.orig/base/lib.mak 2011-11-25 13:06:21.728502636 +0000 27--- ghostscript-9.05.orig/base/lib.mak 2012-03-28 10:55:23.816608117 +0000
23+++ ghostscript-9.04/base/lib.mak 2011-11-25 13:08:33.924504957 +0000 28+++ ghostscript-9.05/base/lib.mak 2012-03-28 10:55:41.864605914 +0000
24@@ -592,10 +592,8 @@ 29@@ -327,7 +327,7 @@
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
32 $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h
33- $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c
34+ $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c || true
35 $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c
36 $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h
37
38@@ -593,22 +593,20 @@
25 $(gscdefs_h) $(gconf_h)\ 39 $(gscdefs_h) $(gconf_h)\
26 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\ 40 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\
27 $(MAKEDDIRS) 41 $(MAKEDDIRS)
@@ -29,8 +43,828 @@ Index: ghostscript-9.04/base/lib.mak
29- $(RM_) $(GLGEN)gconfig.h 43- $(RM_) $(GLGEN)gconfig.h
30- $(CP_) $(gconfig_h) $(GLGEN)gconfig.h 44- $(CP_) $(gconfig_h) $(GLGEN)gconfig.h
31- $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c 45- $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c
32+ $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true 46+ $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true || true
33+ $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true 47+ $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true || true
34 $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c 48 $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c
35 49
36 $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\ 50 $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\
51 $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS)
52 $(RM_) $(GLGEN)gscdefs.c
53- $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c
54+ $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c || true
55 $(GLCC) $(GLO_)gscdefs.$(OBJ) $(C_) $(GLGEN)gscdefs.c
56
57 $(AUX)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\
58 $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS)
59 $(RM_) $(AUX)gscdefs.c
60- $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c
61+ $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c || true
62 $(GLCCAUX) $(AUXO_)gscdefs.$(OBJ) $(C_) $(AUX)gscdefs.c
63
64 $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\
65@@ -1428,7 +1426,7 @@
66 $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c
67
68 $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ)
69- $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ)
70+ $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ) || true
71
72 # sdcparam is used by the filter operator and the PS/PDF writer.
73 # It is not included automatically in sdcte/d.
74@@ -1456,7 +1454,7 @@
75 $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c
76
77 $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
78- $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ)
79+ $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ) || true
80
81
82 $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
83@@ -1472,7 +1470,7 @@
84 $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c
85
86 $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
87- $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ)
88+ $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ) || true
89
90 # sdeparam is used by the filter operator and the PS/PDF writer.
91 # It is not included automatically in sdcte.
92@@ -1504,7 +1502,7 @@
93 $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c
94
95 $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
96- $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ)
97+ $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ) || true
98
99
100 $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
101@@ -1521,7 +1519,7 @@
102
103
104 $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
105- $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ)
106+ $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ) || true
107
108 # sddparam is used by the filter operator.
109 # It is not included automatically in sdctd.
110@@ -1544,7 +1542,7 @@
111
112 # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory.
113 $(GLD)slzwe.dev : $(GLD)lzwe.dev
114- $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev
115+ $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev || true
116
117 $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\
118 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
119@@ -1560,7 +1558,7 @@
120
121 # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory.
122 $(GLD)slzwd.dev : $(GLD)lzwd.dev
123- $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev
124+ $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev || true
125
126 $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\
127 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
128@@ -1610,7 +1608,7 @@
129 # ---------------- JBIG2 compression filter ---------------- #
130
131 $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev
132- $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev
133+ $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev || true
134
135 # jbig2dec version
136 sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ)
137@@ -1646,7 +1644,7 @@
138 # ---------------- JPEG 2000 compression filter ---------------- #
139
140 $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev
141- $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev
142+ $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev || true
143
144 # jasper version
145 sjpx_jasper=$(GLOBJ)sjpx.$(OBJ)
146@@ -1784,7 +1782,7 @@
147 $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c
148
149 $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
150- $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ)
151+ $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ) || true
152
153 szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ)
154 $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_)
155@@ -1800,7 +1798,7 @@
156 $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c
157
158 $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
159- $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ)
160+ $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ) || true
161
162 szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ)
163 $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_)
164@@ -1816,7 +1814,7 @@
165 $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c
166
167 $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
168- $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ)
169+ $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ) || true
170
171 # ---------------- Page devices ---------------- #
172 # We include this here, rather than in devs.mak, because it is more like
173@@ -2757,7 +2755,7 @@
174 $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c
175
176 $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ)
177- $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ)
178+ $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) || true
179
180
181 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
182@@ -2769,7 +2767,7 @@
183 $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c
184
185 $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ)
186- $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ)
187+ $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true
188
189 # Note that gsicc_create requires compile with lcms to obtain icc34.h
190 # header file that is used for creating ICC structures from PS objects.
191@@ -2789,7 +2787,7 @@
192 $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
193
194 $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS)
195- $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ)
196+ $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ) || true
197
198
199 #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */
200@@ -3060,7 +3058,7 @@
201 $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS)
202
203 $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS)
204- $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c
205+ $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c || true
206
207 # the following module is only included if the romfs.dev FEATURE is enabled
208 $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
209@@ -3076,7 +3074,7 @@
210 $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c
211
212 $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
213- $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ)
214+ $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ) || true
215
216 $(GLOBJ)gsromfs1.$(OBJ) : $(GLOBJ)gsromfs1.c $(time__h) $(MAKEDIRS)
217 $(GLCC) $(GLO_)gsromfs1.$(OBJ) $(C_) $(GLOBJ)gsromfs1.c
218Index: ghostscript-9.05/base/expat.mak
219===================================================================
220--- ghostscript-9.05.orig/base/expat.mak 2012-03-28 10:55:34.164607877 +0000
221+++ ghostscript-9.05/base/expat.mak 2012-03-28 10:55:41.852604931 +0000
222@@ -81,7 +81,7 @@
223 # Copy the target definition we want
224 $(EXPATGEN)expat.dev : $(TOP_MAKEFILES) $(EXPAT_MAK) \
225 $(EXPATGEN)expat_$(SHARE_EXPAT).dev
226- $(CP_) $(EXPATGEN)expat_$(SHARE_EXPAT).dev $(EXPATGEN)expat.dev
227+ $(CP_) $(EXPATGEN)expat_$(SHARE_EXPAT).dev $(EXPATGEN)expat.dev || true
228
229 # Define the compiled in target
230 $(EXPATGEN)expat_0.dev : $(EXPAT_MAK) $(ECHOGS_XE) $(expat_)
231Index: ghostscript-9.05/base/freetype.mak
232===================================================================
233--- ghostscript-9.05.orig/base/freetype.mak 2012-03-28 10:55:34.180607877 +0000
234+++ ghostscript-9.05/base/freetype.mak 2012-03-28 10:55:41.852604931 +0000
235@@ -193,7 +193,7 @@
236
237 # instantiate the requested build option (shared or compiled in)
238 $(FTGEN)freetype.dev : $(TOP_MAKEFILES) $(FTGEN)freetype_$(SHARE_FT).dev
239- $(CP_) $(FTGEN)freetype_$(SHARE_FT).dev $(FTGEN)freetype.dev
240+ $(CP_) $(FTGEN)freetype_$(SHARE_FT).dev $(FTGEN)freetype.dev || true
241
242 # Define the shared version.
243 $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE)
244Index: ghostscript-9.05/base/ijs.mak
245===================================================================
246--- ghostscript-9.05.orig/base/ijs.mak 2012-03-28 10:55:34.224607876 +0000
247+++ ghostscript-9.05/base/ijs.mak 2012-03-28 10:55:41.856605305 +0000
248@@ -64,7 +64,7 @@
249
250
251 $(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(IJSGEN)ijslib_$(SHARE_IJS).dev
252- $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev
253+ $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev || true
254
255
256 ijs_h=$(IJSSRC)ijs.h
257Index: ghostscript-9.05/base/jasper.mak
258===================================================================
259--- ghostscript-9.05.orig/base/jasper.mak 2012-03-28 10:55:34.240607876 +0000
260+++ ghostscript-9.05/base/jasper.mak 2012-03-28 10:55:41.856605305 +0000
261@@ -164,7 +164,7 @@
262
263 # switch in the selected .dev
264 $(JASGEN)jasper.dev : $(TOP_MAKEFILES) $(JASGEN)jasper_$(SHARE_JPX).dev
265- $(CP_) $(JASGEN)jasper_$(SHARE_JPX).dev $(JASGEN)jasper.dev
266+ $(CP_) $(JASGEN)jasper_$(SHARE_JPX).dev $(JASGEN)jasper.dev || true
267
268 # external link .dev
269 $(JASGEN)jasper_1.dev : $(TOP_MAKEFILES) $(JASPER_MAK) $(ECHOGS_XE)
270Index: ghostscript-9.05/base/jbig2.mak
271===================================================================
272--- ghostscript-9.05.orig/base/jbig2.mak 2012-03-28 10:55:34.256607875 +0000
273+++ ghostscript-9.05/base/jbig2.mak 2012-03-28 10:55:41.856605305 +0000
274@@ -96,7 +96,7 @@
275
276 # switch in the version of libjbig2.dev we're actually using
277 $(JBIG2GEN)jbig2dec.dev : $(TOP_MAKEFILES) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev
278- $(CP_) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev $(JBIG2GEN)jbig2dec.dev
279+ $(CP_) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev $(JBIG2GEN)jbig2dec.dev || true
280
281 # dev file for shared (separately built) jbig2dec library
282 $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE)
283Index: ghostscript-9.05/base/jpeg.mak
284===================================================================
285--- ghostscript-9.05.orig/base/jpeg.mak 2012-03-28 10:55:34.272607875 +0000
286+++ ghostscript-9.05/base/jpeg.mak 2012-03-28 10:55:41.856605305 +0000
287@@ -94,7 +94,7 @@
288 jmorecfg_h=$(GLGEN)jmorecfg.h
289
290 $(GLGEN)jconfig_.h : $(GLGEN)jconfig$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS)
291- $(CP_) $(GLGEN)jconfig$(SHARE_JPEG).h $(GLGEN)jconfig_.h
292+ $(CP_) $(GLGEN)jconfig$(SHARE_JPEG).h $(GLGEN)jconfig_.h || true
293
294 $(GLGEN)jconfig0.h : $(ECHOGS_XE) $(GLSRC)gsjconf.h $(stdpre_h) $(MAKEFILE)\
295 $(MAKEDIRS)
296@@ -106,13 +106,13 @@
297 $(RMN_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h
298
299 $(GLGEN)jconfig.h : $(GLGEN)jconfig0.h $(MAKEDIRS)
300- $(CP_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h
301+ $(CP_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h || true
302
303 $(GLGEN)jmorecf_.h : $(GLGEN)jmorecf$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS)
304- $(CP_) $(GLGEN)jmorecf$(SHARE_JPEG).h $(GLGEN)jmorecf_.h
305+ $(CP_) $(GLGEN)jmorecf$(SHARE_JPEG).h $(GLGEN)jmorecf_.h || true
306
307 $(GLGEN)jmorecf0.h : $(GLSRC)gsjmorec.h $(GLGEN)jmcorig.h $(MAKEDIRS)
308- $(CP_) $(GLSRC)gsjmorec.h $(GLGEN)jmorecf0.h
309+ $(CP_) $(GLSRC)gsjmorec.h $(GLGEN)jmorecf0.h || true
310 $(RM_) $(GLGEN)jmorecf1.h
311
312 $(GLGEN)jmorecf1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS)
313@@ -120,10 +120,10 @@
314 $(RMN_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h
315
316 $(GLGEN)jmorecfg.h : $(GLGEN)jmorecf0.h $(MAKEDIRS)
317- $(CP_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h
318+ $(CP_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h || true
319
320 $(GLGEN)jmcorig.h : $(JSRC)jmorecfg.h $(MAKEDIRS)
321- $(CP_) $(JSRC)jmorecfg.h $(GLGEN)jmcorig.h
322+ $(CP_) $(JSRC)jmorecfg.h $(GLGEN)jmcorig.h || true
323
324 # Contrary to what some portability bigots assert as fact, C compilers are
325 # not consistent about where they start searching for #included files:
326@@ -139,23 +139,23 @@
327 JHCOPY=$(GLGEN)jinclude.h $(GLGEN)jpeglib.h
328
329 $(GLGEN)jinclude.h : $(JSRC)jinclude.h $(MAKEDIRS)
330- $(CP_) $(JSRC)jinclude.h $(GLGEN)jinclude.h
331+ $(CP_) $(JSRC)jinclude.h $(GLGEN)jinclude.h || true
332
333 # jpeglib_.h doesn't really depend on jconfig.h or jmcorig.h,
334 # but we choose to put the dependencies here rather than in the
335 # definition of jpeglib__h.
336 $(GLGEN)jpeglib_.h : $(GLGEN)jpeglib$(SHARE_JPEG).h $(MAKEDIRS)
337- $(CP_) $(GLGEN)jpeglib$(SHARE_JPEG).h $(GLGEN)jpeglib_.h
338+ $(CP_) $(GLGEN)jpeglib$(SHARE_JPEG).h $(GLGEN)jpeglib_.h || true
339
340 $(GLGEN)jpeglib0.h : $(JSRC)jpeglib.h $(jconfig_h) $(jmorecfg_h) $(MAKEDIRS)
341- $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib0.h
342+ $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib0.h || true
343
344 $(GLGEN)jpeglib1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS)
345 $(EXP)$(ECHOGS_XE) -w $(GLGEN)jpeglib1.h -x 23 include -x 203c jpeglib.h -x 3e
346
347 # We also need jpeglib.h for #includes in the library itself.
348 $(GLGEN)jpeglib.h : $(JSRC)jpeglib.h $(MAKEDIRS)
349- $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib.h
350+ $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib.h || true
351
352 # In order to avoid having to keep the dependency lists for the IJG code
353 # accurate, we simply make all of them depend on the only files that
354@@ -172,40 +172,40 @@
355 $(SETMOD) $(JGEN)jpegc0 $(jpegc0_)
356
357 $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP)
358- $(CP_) $(JSRC)jcomapi.c $(GLGEN)jcomapi.c
359+ $(CP_) $(JSRC)jcomapi.c $(GLGEN)jcomapi.c || true
360 $(JCC) $(JO_)jcomapi.$(OBJ) $(C_) $(GLGEN)jcomapi.c
361 $(RM_) $(GLGEN)jcomapi.c
362
363 $(JOBJ)jutils.$(OBJ) : $(JSRC)jutils.c $(JDEP)
364- $(CP_) $(JSRC)jutils.c $(GLGEN)jutils.c
365+ $(CP_) $(JSRC)jutils.c $(GLGEN)jutils.c || true
366 $(JCC) $(JO_)jutils.$(OBJ) $(C_) $(GLGEN)jutils.c
367 $(RM_) $(GLGEN)jutils.c
368
369 $(JOBJ)jmemmgr.$(OBJ) : $(JSRC)jmemmgr.c $(JDEP)
370- $(CP_) $(JSRC)jmemmgr.c $(GLGEN)jmemmgr.c
371+ $(CP_) $(JSRC)jmemmgr.c $(GLGEN)jmemmgr.c || true
372 $(JCC) $(JO_)jmemmgr.$(OBJ) $(C_) $(GLGEN)jmemmgr.c
373 $(RM_) $(GLGEN)jmemmgr.c
374
375 $(JOBJ)jerror.$(OBJ) : $(JSRC)jerror.c $(JDEP)
376- $(CP_) $(JSRC)jerror.c $(GLGEN)jerror.c
377+ $(CP_) $(JSRC)jerror.c $(GLGEN)jerror.c || true
378 $(JCC) $(JO_)jerror.$(OBJ) $(C_) $(GLGEN)jerror.c
379 $(RM_) $(GLGEN)jerror.c
380
381 $(JOBJ)jaricom.$(OBJ) : $(JSRC)jaricom.c $(JDEP)
382- $(CP_) $(JSRC)jaricom.c $(GLGEN)jaricom.c
383+ $(CP_) $(JSRC)jaricom.c $(GLGEN)jaricom.c || true
384 $(JCC) $(JO_)jaricom.$(OBJ) $(C_) $(GLGEN)jaricom.c
385 $(RM_) $(GLGEN)jaricom.c
386
387 # Encoding (compression) code.
388
389 $(JGEN)jpege.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpege_$(SHARE_JPEG).dev
390- $(CP_) $(JGEN)jpege_$(SHARE_JPEG).dev $(JGEN)jpege.dev
391+ $(CP_) $(JGEN)jpege_$(SHARE_JPEG).dev $(JGEN)jpege.dev || true
392
393 $(JGEN)jpege_1.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(ECHOGS_XE)
394 $(SETMOD) $(JGEN)jpege_1 -lib $(JPEG_NAME)
395
396 $(JGEN)jpege_0.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpege6.dev
397- $(CP_) $(JGEN)jpege6.dev $(JGEN)jpege_0.dev
398+ $(CP_) $(JGEN)jpege6.dev $(JGEN)jpege_0.dev || true
399
400 jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ)
401
402@@ -221,90 +221,90 @@
403 $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3)
404
405 $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP)
406- $(CP_) $(JSRC)jcapimin.c $(GLGEN)jcapimin.c
407+ $(CP_) $(JSRC)jcapimin.c $(GLGEN)jcapimin.c || true
408 $(JCC) $(JO_)jcapimin.$(OBJ) $(C_) $(GLGEN)jcapimin.c
409 $(RM_) $(GLGEN)jcapimin.c
410
411 $(JOBJ)jcapistd.$(OBJ) : $(JSRC)jcapistd.c $(JDEP)
412- $(CP_) $(JSRC)jcapistd.c $(GLGEN)jcapistd.c
413+ $(CP_) $(JSRC)jcapistd.c $(GLGEN)jcapistd.c || true
414 $(JCC) $(JO_)jcapistd.$(OBJ) $(C_) $(GLGEN)jcapistd.c
415 $(RM_) $(GLGEN)jcapistd.c
416
417 $(JOBJ)jcinit.$(OBJ) : $(JSRC)jcinit.c $(JDEP)
418- $(CP_) $(JSRC)jcinit.c $(GLGEN)jcinit.c
419+ $(CP_) $(JSRC)jcinit.c $(GLGEN)jcinit.c || true
420 $(JCC) $(JO_)jcinit.$(OBJ) $(C_) $(GLGEN)jcinit.c
421 $(RM_) $(GLGEN)jcinit.c
422
423 $(JOBJ)jccoefct.$(OBJ) : $(JSRC)jccoefct.c $(JDEP)
424- $(CP_) $(JSRC)jccoefct.c $(GLGEN)jccoefct.c
425+ $(CP_) $(JSRC)jccoefct.c $(GLGEN)jccoefct.c || true
426 $(JCC) $(JO_)jccoefct.$(OBJ) $(C_) $(GLGEN)jccoefct.c
427 $(RM_) $(GLGEN)jccoefct.c
428
429 $(JOBJ)jccolor.$(OBJ) : $(JSRC)jccolor.c $(JDEP)
430- $(CP_) $(JSRC)jccolor.c $(GLGEN)jccolor.c
431+ $(CP_) $(JSRC)jccolor.c $(GLGEN)jccolor.c || true
432 $(JCC) $(JO_)jccolor.$(OBJ) $(C_) $(GLGEN)jccolor.c
433 $(RM_) $(GLGEN)jccolor.c
434
435 $(JOBJ)jcdctmgr.$(OBJ) : $(JSRC)jcdctmgr.c $(JDEP)
436- $(CP_) $(JSRC)jcdctmgr.c $(GLGEN)jcdctmgr.c
437+ $(CP_) $(JSRC)jcdctmgr.c $(GLGEN)jcdctmgr.c || true
438 $(JCC) $(JO_)jcdctmgr.$(OBJ) $(C_) $(GLGEN)jcdctmgr.c
439 $(RM_) $(GLGEN)jcdctmgr.c
440
441 $(JOBJ)jchuff.$(OBJ) : $(JSRC)jchuff.c $(JDEP)
442- $(CP_) $(JSRC)jchuff.c $(GLGEN)jchuff.c
443+ $(CP_) $(JSRC)jchuff.c $(GLGEN)jchuff.c || true
444 $(JCC) $(JO_)jchuff.$(OBJ) $(C_) $(GLGEN)jchuff.c
445 $(RM_) $(GLGEN)jchuff.c
446
447 $(JOBJ)jcmainct.$(OBJ) : $(JSRC)jcmainct.c $(JDEP)
448- $(CP_) $(JSRC)jcmainct.c $(GLGEN)jcmainct.c
449+ $(CP_) $(JSRC)jcmainct.c $(GLGEN)jcmainct.c || true
450 $(JCC) $(JO_)jcmainct.$(OBJ) $(C_) $(GLGEN)jcmainct.c
451 $(RM_) $(GLGEN)jcmainct.c
452
453 $(JOBJ)jcmarker.$(OBJ) : $(JSRC)jcmarker.c $(JDEP)
454- $(CP_) $(JSRC)jcmarker.c $(GLGEN)jcmarker.c
455+ $(CP_) $(JSRC)jcmarker.c $(GLGEN)jcmarker.c || true
456 $(JCC) $(JO_)jcmarker.$(OBJ) $(C_) $(GLGEN)jcmarker.c
457 $(RM_) $(GLGEN)jcmarker.c
458
459 $(JOBJ)jcmaster.$(OBJ) : $(JSRC)jcmaster.c $(JDEP)
460- $(CP_) $(JSRC)jcmaster.c $(GLGEN)jcmaster.c
461+ $(CP_) $(JSRC)jcmaster.c $(GLGEN)jcmaster.c || true
462 $(JCC) $(JO_)jcmaster.$(OBJ) $(C_) $(GLGEN)jcmaster.c
463 $(RM_) $(GLGEN)jcmaster.c
464
465 $(JOBJ)jcparam.$(OBJ) : $(JSRC)jcparam.c $(JDEP)
466- $(CP_) $(JSRC)jcparam.c $(GLGEN)jcparam.c
467+ $(CP_) $(JSRC)jcparam.c $(GLGEN)jcparam.c || true
468 $(JCC) $(JO_)jcparam.$(OBJ) $(C_) $(GLGEN)jcparam.c
469 $(RM_) $(GLGEN)jcparam.c
470
471 $(JOBJ)jcprepct.$(OBJ) : $(JSRC)jcprepct.c $(JDEP)
472- $(CP_) $(JSRC)jcprepct.c $(GLGEN)jcprepct.c
473+ $(CP_) $(JSRC)jcprepct.c $(GLGEN)jcprepct.c || true
474 $(JCC) $(JO_)jcprepct.$(OBJ) $(C_) $(GLGEN)jcprepct.c
475 $(RM_) $(GLGEN)jcprepct.c
476
477 $(JOBJ)jcsample.$(OBJ) : $(JSRC)jcsample.c $(JDEP)
478- $(CP_) $(JSRC)jcsample.c $(GLGEN)jcsample.c
479+ $(CP_) $(JSRC)jcsample.c $(GLGEN)jcsample.c || true
480 $(JCC) $(JO_)jcsample.$(OBJ) $(C_) $(GLGEN)jcsample.c
481 $(RM_) $(GLGEN)jcsample.c
482
483 $(JOBJ)jfdctint.$(OBJ) : $(JSRC)jfdctint.c $(JDEP)
484- $(CP_) $(JSRC)jfdctint.c $(GLGEN)jfdctint.c
485+ $(CP_) $(JSRC)jfdctint.c $(GLGEN)jfdctint.c || true
486 $(JCC) $(JO_)jfdctint.$(OBJ) $(C_) $(GLGEN)jfdctint.c
487 $(RM_) $(GLGEN)jfdctint.c
488
489 $(JOBJ)jcarith.$(OBJ) : $(JSRC)jcarith.c $(JDEP)
490- $(CP_) $(JSRC)jcarith.c $(GLGEN)jcarith.c
491+ $(CP_) $(JSRC)jcarith.c $(GLGEN)jcarith.c || true
492 $(JCC) $(JO_)jcarith.$(OBJ) $(C_) $(GLGEN)jcarith.c
493 $(RM_) $(GLGEN)jcarith.c
494
495 # Decompression code
496
497 $(JGEN)jpegd.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpegd_$(SHARE_JPEG).dev
498- $(CP_) $(JGEN)jpegd_$(SHARE_JPEG).dev $(JGEN)jpegd.dev
499+ $(CP_) $(JGEN)jpegd_$(SHARE_JPEG).dev $(JGEN)jpegd.dev || true
500
501 $(JGEN)jpegd_1.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(ECHOGS_XE)
502 $(SETMOD) $(JGEN)jpegd_1 -lib $(JPEG_NAME)
503
504 $(JGEN)jpegd_0.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpegd6.dev
505- $(CP_) $(JGEN)jpegd6.dev $(JGEN)jpegd_0.dev
506+ $(CP_) $(JGEN)jpegd6.dev $(JGEN)jpegd_0.dev || true
507
508 jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ)
509
510@@ -320,76 +320,76 @@
511 $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3)
512
513 $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP)
514- $(CP_) $(JSRC)jdapimin.c $(GLGEN)jdapimin.c
515+ $(CP_) $(JSRC)jdapimin.c $(GLGEN)jdapimin.c || true
516 $(JCC) $(JO_)jdapimin.$(OBJ) $(C_) $(GLGEN)jdapimin.c
517 $(RM_) $(GLGEN)jdapimin.c
518
519 $(JOBJ)jdapistd.$(OBJ) : $(JSRC)jdapistd.c $(JDEP)
520- $(CP_) $(JSRC)jdapistd.c $(GLGEN)jdapistd.c
521+ $(CP_) $(JSRC)jdapistd.c $(GLGEN)jdapistd.c || true
522 $(JCC) $(JO_)jdapistd.$(OBJ) $(C_) $(GLGEN)jdapistd.c
523 $(RM_) $(GLGEN)jdapistd.c
524
525 $(JOBJ)jdcoefct.$(OBJ) : $(JSRC)jdcoefct.c $(JDEP)
526- $(CP_) $(JSRC)jdcoefct.c $(GLGEN)jdcoefct.c
527+ $(CP_) $(JSRC)jdcoefct.c $(GLGEN)jdcoefct.c || true
528 $(JCC) $(JO_)jdcoefct.$(OBJ) $(C_) $(GLGEN)jdcoefct.c
529 $(RM_) $(GLGEN)jdcoefct.c
530
531 $(JOBJ)jdcolor.$(OBJ) : $(JSRC)jdcolor.c $(JDEP)
532- $(CP_) $(JSRC)jdcolor.c $(GLGEN)jdcolor.c
533+ $(CP_) $(JSRC)jdcolor.c $(GLGEN)jdcolor.c || true
534 $(JCC) $(JO_)jdcolor.$(OBJ) $(C_) $(GLGEN)jdcolor.c
535 $(RM_) $(GLGEN)jdcolor.c
536
537 $(JOBJ)jddctmgr.$(OBJ) : $(JSRC)jddctmgr.c $(JDEP)
538- $(CP_) $(JSRC)jddctmgr.c $(GLGEN)jddctmgr.c
539+ $(CP_) $(JSRC)jddctmgr.c $(GLGEN)jddctmgr.c || true
540 $(JCC) $(JO_)jddctmgr.$(OBJ) $(C_) $(GLGEN)jddctmgr.c
541 $(RM_) $(GLGEN)jddctmgr.c
542
543 $(JOBJ)jdhuff.$(OBJ) : $(JSRC)jdhuff.c $(JDEP)
544- $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c
545+ $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c || true
546 $(JCC) $(JO_)jdhuff.$(OBJ) $(C_) $(GLGEN)jdhuff.c
547 $(RM_) $(GLGEN)jdhuff.c
548
549 $(JOBJ)jdinput.$(OBJ) : $(JSRC)jdinput.c $(JDEP)
550- $(CP_) $(JSRC)jdinput.c $(GLGEN)jdinput.c
551+ $(CP_) $(JSRC)jdinput.c $(GLGEN)jdinput.c || true
552 $(JCC) $(JO_)jdinput.$(OBJ) $(C_) $(GLGEN)jdinput.c
553 $(RM_) $(GLGEN)jdinput.c
554
555 $(JOBJ)jdmainct.$(OBJ) : $(JSRC)jdmainct.c $(JDEP)
556- $(CP_) $(JSRC)jdmainct.c $(GLGEN)jdmainct.c
557+ $(CP_) $(JSRC)jdmainct.c $(GLGEN)jdmainct.c || true
558 $(JCC) $(JO_)jdmainct.$(OBJ) $(C_) $(GLGEN)jdmainct.c
559 $(RM_) $(GLGEN)jdmainct.c
560
561 $(JOBJ)jdmarker.$(OBJ) : $(JSRC)jdmarker.c $(JDEP)
562- $(CP_) $(JSRC)jdmarker.c $(GLGEN)jdmarker.c
563+ $(CP_) $(JSRC)jdmarker.c $(GLGEN)jdmarker.c || true
564 $(JCC) $(JO_)jdmarker.$(OBJ) $(C_) $(GLGEN)jdmarker.c
565 $(RM_) $(GLGEN)jdmarker.c
566
567 $(JOBJ)jdmaster.$(OBJ) : $(JSRC)jdmaster.c $(JDEP)
568- $(CP_) $(JSRC)jdmaster.c $(GLGEN)jdmaster.c
569+ $(CP_) $(JSRC)jdmaster.c $(GLGEN)jdmaster.c || true
570 $(JCC) $(JO_)jdmaster.$(OBJ) $(C_) $(GLGEN)jdmaster.c
571 $(RM_) $(GLGEN)jdmaster.c
572
573 #$(JOBJ)jdhuff.$(OBJ) : $(JSRC)jdhuff.c $(JDEP)
574-# $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c
575+# $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c || true
576 # $(JCC) $(JO_)jdhuff.$(OBJ) $(C_) $(GLGEN)jdhuff.c
577 # $(RM_) $(GLGEN)jdhuff.c
578
579 $(JOBJ)jdpostct.$(OBJ) : $(JSRC)jdpostct.c $(JDEP)
580- $(CP_) $(JSRC)jdpostct.c $(GLGEN)jdpostct.c
581+ $(CP_) $(JSRC)jdpostct.c $(GLGEN)jdpostct.c || true
582 $(JCC) $(JO_)jdpostct.$(OBJ) $(C_) $(GLGEN)jdpostct.c
583 $(RM_) $(GLGEN)jdpostct.c
584
585 $(JOBJ)jdsample.$(OBJ) : $(JSRC)jdsample.c $(JDEP)
586- $(CP_) $(JSRC)jdsample.c $(GLGEN)jdsample.c
587+ $(CP_) $(JSRC)jdsample.c $(GLGEN)jdsample.c || true
588 $(JCC) $(JO_)jdsample.$(OBJ) $(C_) $(GLGEN)jdsample.c
589 $(RM_) $(GLGEN)jdsample.c
590
591 $(JOBJ)jidctint.$(OBJ) : $(JSRC)jidctint.c $(JDEP)
592- $(CP_) $(JSRC)jidctint.c $(GLGEN)jidctint.c
593+ $(CP_) $(JSRC)jidctint.c $(GLGEN)jidctint.c || true
594 $(JCC) $(JO_)jidctint.$(OBJ) $(C_) $(GLGEN)jidctint.c
595 $(RM_) $(GLGEN)jidctint.c
596
597 $(JOBJ)jdarith.$(OBJ) : $(JSRC)jdarith.c $(JDEP)
598- $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c
599+ $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c || true
600 $(JCC) $(JO_)jdarith.$(OBJ) $(C_) $(GLGEN)jdarith.c
601 $(RM_) $(GLGEN)jdarith.c
602Index: ghostscript-9.05/base/jpegxr.mak
603===================================================================
604--- ghostscript-9.05.orig/base/jpegxr.mak 2012-03-28 10:55:34.288607875 +0000
605+++ ghostscript-9.05/base/jpegxr.mak 2012-03-28 10:55:41.856605305 +0000
606@@ -100,7 +100,7 @@
607 # Copy the target definition we want
608 $(JPEGXR_GEN)jpegxr.dev : $(TOP_MAKEFILES) $(JPEGXR_MAK) \
609 $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev
610- $(CP_) $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev $(JPEGXR_GEN)jpegxr.dev
611+ $(CP_) $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev $(JPEGXR_GEN)jpegxr.dev || true
612
613 # Define the compiled in target
614 $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs)
615Index: ghostscript-9.05/base/lcms.mak
616===================================================================
617--- ghostscript-9.05.orig/base/lcms.mak 2012-03-28 10:55:34.320607874 +0000
618+++ ghostscript-9.05/base/lcms.mak 2012-03-28 10:55:41.856605305 +0000
619@@ -83,7 +83,7 @@
620
621 # switch in the version of lcms.dev we're actually using
622 $(LCMSGEN)lcms.dev : $(TOP_MAKEFILES) $(LCMSGEN)lcms_$(SHARE_LCMS).dev
623- $(CP_) $(LCMSGEN)lcms_$(SHARE_LCMS).dev $(LCMSGEN)lcms.dev
624+ $(CP_) $(LCMSGEN)lcms_$(SHARE_LCMS).dev $(LCMSGEN)lcms.dev || true
625
626 # dev file for shared (separately built) lcms library
627 $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE)
628Index: ghostscript-9.05/base/lcms2.mak
629===================================================================
630--- ghostscript-9.05.orig/base/lcms2.mak 2012-03-28 10:55:34.304607874 +0000
631+++ ghostscript-9.05/base/lcms2.mak 2012-03-28 10:55:41.856605305 +0000
632@@ -83,7 +83,7 @@
633
634 # switch in the version of lcms2.dev we're actually using
635 $(LCMS2GEN)lcms2.dev : $(TOP_MAKEFILES) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev
636- $(CP_) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2.dev
637+ $(CP_) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2.dev || true
638
639 # dev file for shared (separately built) lcms library
640 $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE)
641Index: ghostscript-9.05/base/lcups.mak
642===================================================================
643--- ghostscript-9.05.orig/base/lcups.mak 2012-03-28 10:55:34.352607873 +0000
644+++ ghostscript-9.05/base/lcups.mak 2012-03-28 10:55:41.856605305 +0000
645@@ -112,7 +112,7 @@
646
647 # instantiate the requested build option (shared or compiled in)
648 $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev
649- $(CP_) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev $(LIBCUPSGEN)lcups.dev
650+ $(CP_) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev $(LIBCUPSGEN)lcups.dev || true
651
652 # Define the shared version.
653 $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE)
654@@ -129,7 +129,7 @@
655 # for simplicity we have every source file depend on all headers
656
657 $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h
658- $(CP_) $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h $(LIBCUPSGEN)$(D)cups$(D)config.h
659+ $(CP_) $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h $(LIBCUPSGEN)$(D)cups$(D)config.h || true
660
661 $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h
662 $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c
663@@ -216,7 +216,7 @@
664 $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c
665
666 $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS)
667- $(CP_) $(LIBCUPSSRC)md5.c $(LIBCUPSGEN)cups_md5.c
668+ $(CP_) $(LIBCUPSSRC)md5.c $(LIBCUPSGEN)cups_md5.c || true
669 $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c
670
671 $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS)
672@@ -253,7 +253,7 @@
673 $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c
674
675 $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS)
676- $(CP_) $(LIBCUPSSRC)snprintf.c $(LIBCUPSGEN)cups_snpf.c
677+ $(CP_) $(LIBCUPSSRC)snprintf.c $(LIBCUPSGEN)cups_snpf.c || true
678 $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c
679
680 $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS)
681@@ -269,5 +269,5 @@
682 $(LCUPS_CC) $(LCUPSO_)usersys.$(OBJ) $(C_) $(LIBCUPSSRC)usersys.c
683
684 $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS)
685- $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c
686+ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true
687 $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c
688Index: ghostscript-9.05/base/lcupsi.mak
689===================================================================
690--- ghostscript-9.05.orig/base/lcupsi.mak 2012-03-28 10:55:34.336607873 +0000
691+++ ghostscript-9.05/base/lcupsi.mak 2012-03-28 10:55:41.856605305 +0000
692@@ -71,7 +71,7 @@
693
694 # instantiate the requested build option (shared or compiled in)
695 $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev
696- $(CP_) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev $(LIBCUPSIGEN)lcupsi.dev
697+ $(CP_) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev $(LIBCUPSIGEN)lcupsi.dev || true
698
699 # Define the shared version.
700 $(LIBCUPSIGEN)lcupsi_1.dev : $(TOP_MAKEFILES) $(LCUPSI_MAK) $(ECHOGS_XE)
701Index: ghostscript-9.05/base/ldf_jb2.mak
702===================================================================
703--- ghostscript-9.05.orig/base/ldf_jb2.mak 2012-03-28 10:55:34.368607873 +0000
704+++ ghostscript-9.05/base/ldf_jb2.mak 2012-03-28 10:55:41.860605619 +0000
705@@ -222,7 +222,7 @@
706
707 # switch in the selected library .dev
708 $(LDF_JB2_GEN)ldf_jb2.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev
709- $(CP_) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev $(LDF_JB2_GEN)ldf_jb2.dev
710+ $(CP_) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev $(LDF_JB2_GEN)ldf_jb2.dev || true
711
712 # external link .dev
713 $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE)
714Index: ghostscript-9.05/base/lwf_jp2.mak
715===================================================================
716--- ghostscript-9.05.orig/base/lwf_jp2.mak 2012-03-28 10:55:34.384607872 +0000
717+++ ghostscript-9.05/base/lwf_jp2.mak 2012-03-28 10:55:41.864605914 +0000
718@@ -175,7 +175,7 @@
719
720 # switch in the selected library .dev
721 $(LWF_JP2_GEN)lwf_jp2.dev : $(TOP_MAKEFILES) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev
722- $(CP_) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev $(LWF_JP2_GEN)lwf_jp2.dev
723+ $(CP_) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev $(LWF_JP2_GEN)lwf_jp2.dev || true
724
725 # external link .dev
726 $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE)
727Index: ghostscript-9.05/base/macos-mcp.mak
728===================================================================
729--- ghostscript-9.05.orig/base/macos-mcp.mak 2012-03-28 10:55:34.416607872 +0000
730+++ ghostscript-9.05/base/macos-mcp.mak 2012-03-28 10:55:41.864605914 +0000
731@@ -384,11 +384,11 @@
732
733 $(CWPROJ_XML): $(gconfigd_h)
734 -mkdir -p obj/sys
735- $(CP_) $(macsystypes_h) $(systypes_h)
736+ $(CP_) $(macsystypes_h) $(systypes_h) || true
737 $(SH) $(GLSRC)macgenmcpxml.sh `$(CAT) $(ld_tr)` > $(CWPROJ_XML)
738- $(CP_) $(GLSRC)gconf.c $(GLOBJ)gconfig.c
739- $(CP_) $(GLSRC)iconf.c $(GLOBJ)iconfig.c
740- $(CP_) $(GLSRC)gscdef.c $(GLOBJ)gscdefs.c
741+ $(CP_) $(GLSRC)gconf.c $(GLOBJ)gconfig.c || true
742+ $(CP_) $(GLSRC)iconf.c $(GLOBJ)iconfig.c || true
743+ $(CP_) $(GLSRC)gscdef.c $(GLOBJ)gscdefs.c || true
744 /Developer/Tools/SetFile -c CWIE -t TEXT $(CWPROJ_XML)
745
746 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
747Index: ghostscript-9.05/base/openjpeg.mak
748===================================================================
749--- ghostscript-9.05.orig/base/openjpeg.mak 2012-03-28 10:55:34.492607870 +0000
750+++ ghostscript-9.05/base/openjpeg.mak 2012-03-28 10:55:41.868606149 +0000
751@@ -86,11 +86,11 @@
752 $(OPEN_JPEG_SRC)tgt.h \
753
754 $(OPEN_JPEG_CONFIG_H): $(TOP_MAKEFILES) $(JPXSRCDIR)$(D)opj_config.h.in.user
755- $(CP_) $(JPXSRCDIR)$(D)opj_config.h.in.user $(OPEN_JPEG_CONFIG_H)
756+ $(CP_) $(JPXSRCDIR)$(D)opj_config.h.in.user $(OPEN_JPEG_CONFIG_H) || true
757
758 # switch in the selected library .dev
759 $(OPEN_JPEG_GEN)openjpeg.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev
760- $(CP_) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev $(OPEN_JPEG_GEN)openjpeg.dev
761+ $(CP_) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev $(OPEN_JPEG_GEN)openjpeg.dev || true
762
763 # external link .dev
764 $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE)
765Index: ghostscript-9.05/base/openvms.mak
766===================================================================
767--- ghostscript-9.05.orig/base/openvms.mak 2012-03-28 10:55:34.508607869 +0000
768+++ ghostscript-9.05/base/openvms.mak 2012-03-28 10:55:41.868606149 +0000
769@@ -364,7 +364,7 @@
770
771 # Define generic commands.
772
773-CP_=$$ @$(GLSRCDIR)COPY_ONE
774+CP_=$$ @$(GLSRCDIR)COPY_ONE || true
775
776 # Define the command for deleting (a) file(s) (including wild cards)
777
778Index: ghostscript-9.05/base/png.mak
779===================================================================
780--- ghostscript-9.05.orig/base/png.mak 2012-03-28 10:55:34.540607869 +0000
781+++ ghostscript-9.05/base/png.mak 2012-03-28 10:55:41.868606149 +0000
782@@ -123,7 +123,7 @@
783
784 # Define the version of libpng.dev that we are actually using.
785 $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev
786- $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev
787+ $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev || true
788
789 # Define the shared version of libpng.
790 # Note that it requires libz, which must be searched *after* libpng.
791Index: ghostscript-9.05/base/tiff.mak
792===================================================================
793--- ghostscript-9.05.orig/base/tiff.mak 2012-03-28 10:55:34.556607868 +0000
794+++ ghostscript-9.05/base/tiff.mak 2012-03-28 10:55:41.868606149 +0000
795@@ -48,11 +48,11 @@
796
797 $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in
798 cd $(TIFFSRC) && ./configure
799- $(CP_) $(TIFFSRC)libtiff$(D)tif_config.h $(TIFFSRC)libtiff$(D)tif_config.unix.h
800+ $(CP_) $(TIFFSRC)libtiff$(D)tif_config.h $(TIFFSRC)libtiff$(D)tif_config.unix.h || true
801
802 $(TIFFSRC)libtiff$(D)tiffconf.unix.h : $(TIFFSRC)libtiff$(D)tiffconf.h.in
803 cd $(TIFFSRC) && ./configure
804- $(CP_) $(TIFFSRC)libtiff$(D)tiffconf.h $(TIFFSRC)libtiff$(D)tiffconf.unix.h
805+ $(CP_) $(TIFFSRC)libtiff$(D)tiffconf.h $(TIFFSRC)libtiff$(D)tiffconf.unix.h || true
806
807 $(TIFFOBJ)tif_aux.$(OBJ) : $(TIFFSRC)/libtiff/tif_aux.c $(TIFFDEP)
808 $(TIFFCC) $(TIFFO_)tif_aux.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_aux.c
809@@ -178,14 +178,14 @@
810 $(TIFFCC) $(TIFFO_)tif_unix.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_unix.c
811
812 $(TIFFGEN)tif_config.h: $(TIFFCONFIG)
813- $(CP_) $(TIFFCONFIG) $(TIFFGEN)tif_config.h
814+ $(CP_) $(TIFFCONFIG) $(TIFFGEN)tif_config.h || true
815
816 $(TIFFGEN)tiffconf.h: $(TIFFCONF)
817- $(CP_) $(TIFFCONF) $(TIFFGEN)tiffconf.h
818+ $(CP_) $(TIFFCONF) $(TIFFGEN)tiffconf.h || true
819
820 # Define the version of libtiff.dev that we are actually using.
821 $(TIFFGEN)libtiff.dev : $(TOP_MAKEFILES) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev
822- $(CP_) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev $(TIFFGEN)libtiff.dev
823+ $(CP_) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev $(TIFFGEN)libtiff.dev || true
824
825
826 # Define the shared version.
827Index: ghostscript-9.05/base/unix-aux.mak
828===================================================================
829--- ghostscript-9.05.orig/base/unix-aux.mak 2012-03-28 10:55:34.604607867 +0000
830+++ ghostscript-9.05/base/unix-aux.mak 2012-03-28 10:55:41.868606149 +0000
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)
833 #
834 #$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
835-# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
836+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) || true
837
838 # Query the environment to construct gconfig_.h.
839 # The "else true;" is required because Ultrix's implementation of sh -e
840Index: ghostscript-9.05/base/zlib.mak
841===================================================================
842--- ghostscript-9.05.orig/base/zlib.mak 2012-03-28 10:55:34.744607864 +0000
843+++ ghostscript-9.05/base/zlib.mak 2012-03-28 10:55:41.872606358 +0000
844@@ -82,7 +82,7 @@
845 # Encoding (compression) code.
846
847 $(ZGEN)zlibe.dev : $(TOP_MAKEFILES) $(ZGEN)zlibe_$(SHARE_ZLIB).dev
848- $(CP_) $(ZGEN)zlibe_$(SHARE_ZLIB).dev $(ZGEN)zlibe.dev
849+ $(CP_) $(ZGEN)zlibe_$(SHARE_ZLIB).dev $(ZGEN)zlibe.dev || true
850
851 $(ZGEN)zlibe_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
852 $(SETMOD) $(ZGEN)zlibe_1 -lib $(ZLIB_NAME)
853@@ -110,7 +110,7 @@
854 # with 0.90 do.
855
856 $(ZGEN)crc32.dev : $(TOP_MAKEFILES) $(ZGEN)crc32_$(SHARE_ZLIB).dev
857- $(CP_) $(ZGEN)crc32_$(SHARE_ZLIB).dev $(ZGEN)crc32.dev
858+ $(CP_) $(ZGEN)crc32_$(SHARE_ZLIB).dev $(ZGEN)crc32.dev || true
859
860 $(ZGEN)crc32_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
861 $(SETMOD) $(ZGEN)crc32_1 -lib $(ZLIB_NAME)
862@@ -126,7 +126,7 @@
863 # Decoding (decompression) code.
864
865 $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev
866- $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev
867+ $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev || true
868
869 $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
870 $(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 67b1cf732c..6fc9f572e8 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"
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8"
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 = ""