summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ghostscript
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2013-06-24 22:56:26 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-25 17:44:59 +0100
commitfb52e2f957f2fccba1a1f665160f9bc9d5623ca1 (patch)
tree77827f6526da07b84e24da563bb9771aefc02971 /meta/recipes-extended/ghostscript
parent1f57651ba12db7c3ce53ee8cdbde0ff4802eae92 (diff)
downloadpoky-fb52e2f957f2fccba1a1f665160f9bc9d5623ca1.tar.gz
ghostscript: upgrade to 9.07
Remove unuseful patch: * 0001-make-ghostscript-work-with-long-building-directory.patch Port applicable patches: * ghostscript-9.02-genarch.patch * ghostscript-9.02-parallel-make.patch * ghostscript-9.02-prevent_recompiling.patch * ghostscript-9.05-NOT-check-endian.patch * ghostscript-native-fix-disable-system-libtiff.patch (From OE-Core rev: aea8f29275fd7c2341c429b46c25e17afe532b3e) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ghostscript')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/0001-make-ghostscript-work-with-long-building-directory.patch22
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch3
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch686
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch67
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch42
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch13
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.07.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.05.bb)17
7 files changed, 421 insertions, 429 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/0001-make-ghostscript-work-with-long-building-directory.patch b/meta/recipes-extended/ghostscript/ghostscript/0001-make-ghostscript-work-with-long-building-directory.patch
deleted file mode 100644
index 4dbf86f3ac..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/0001-make-ghostscript-work-with-long-building-directory.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Accepted
2
3Make ghost script work with long building directory
4
5This patch has been accepted by upstream and should be removed
6at the next update of ghostscript.
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9
10Index: base/genconf.c
11==============================================================
12--- a/base/genconf.c
13+++ b/base/genconf.c
14@@ -682,7 +682,7 @@ read_dev(config_t * pconf, const char *arg)
15 string_item_t *item;
16 const char *in;
17
18-#define MAX_TOKEN 256
19+#define MAX_TOKEN 512
20 char *token = malloc(MAX_TOKEN + 1);
21 char *category = malloc(MAX_TOKEN + 1);
22 int file_index;
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
index c18246cdb8..e28a949bf7 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
@@ -5,6 +5,7 @@ to Richard's opinion.
5Upstream-Status: Pending 5Upstream-Status: Pending
6 6
7Signed-off-by: Kang Kai <kai.kang@windriver.com> 7Signed-off-by: Kang Kai <kai.kang@windriver.com>
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
8 9
9# Author: Chi Xu <chi.xu@windriver.com> 10# Author: Chi Xu <chi.xu@windriver.com>
10# Date: Feb 26 2010 11# Date: Feb 26 2010
@@ -14,7 +15,7 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
14diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak 15diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak
15--- ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.000000000 +0800 16--- ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.000000000 +0800
16+++ ghostscript-8.64/base/lib.mak 2010-02-10 10:56:21.000000000 +0800 17+++ ghostscript-8.64/base/lib.mak 2010-02-10 10:56:21.000000000 +0800
17@@ -66,8 +66,8 @@ 18@@ -67,8 +67,8 @@
18 stdpre_h=$(GLSRC)stdpre.h $(stdpn_h) 19 stdpre_h=$(GLSRC)stdpre.h $(stdpn_h)
19 stdint__h=$(GLSRC)stdint_.h $(std_h) 20 stdint__h=$(GLSRC)stdint_.h $(std_h)
20 21
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 7b72023741..f3c0a73c85 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
@@ -4,222 +4,17 @@ http://bugzilla.pokylinux.org/show_bug.cgi?id=1202
4Upstream-Status: Pending 4Upstream-Status: Pending
5 5
6Signed-off-by: Kang Kai <kai.kang@windriver.com> 6Signed-off-by: Kang Kai <kai.kang@windriver.com>
7Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
7 8
8RP: Extended || true to all CP_ operations, they all can race e.g.: 9RP: Extended || true to all CP_ operations, they all can race e.g.:
9| cp -f ./obj/gconfxx.h ./obj/gconfig.h 10| cp -f ./obj/gconfxx.h ./obj/gconfig.h
10| cp: cannot create regular file `./obj/gconfig.h': File exists 11| cp: cannot create regular file `./obj/gconfig.h': File exists
11 12
12Index: ghostscript-9.05/base/unixhead.mak 13diff --git a/base/expat.mak b/base/expat.mak
13=================================================================== 14index 4ee9c8c..2e16a9d 100644
14--- ghostscript-9.05.orig/base/unixhead.mak 2012-03-29 08:27:46.458812172 +0000 15--- a/base/expat.mak
15+++ ghostscript-9.05/base/unixhead.mak 2012-03-29 08:27:52.526811946 +0000 16+++ b/base/expat.mak
16@@ -54,7 +54,7 @@ 17@@ -82,7 +82,7 @@ $(EXPATOBJ)xmltok.$(OBJ) : $(EXPATSRC)xmltok.c $(expat_xmltok_hdrs)
17
18 # Define generic commands.
19
20-CP_=cp
21+CP_=cp -f
22 RM_=rm -f
23 RMN_=rm -f
24
25Index: ghostscript-9.05/base/lib.mak
26===================================================================
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-29 08:27:52.526811946 +0000
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 @@
39 $(gscdefs_h) $(gconf_h)\
40 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\
41 $(MAKEDDIRS)
42- $(RM_) $(GLGEN)gconfig.c
43- $(RM_) $(GLGEN)gconfig.h
44- $(CP_) $(gconfig_h) $(GLGEN)gconfig.h
45- $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c
46+ $(CP_) $(gconfig_h) $(GLGEN)gconfig.h || true
47+ $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true
48 $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c
49
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-02-08 08:48:48.000000000 +0000
221+++ ghostscript-9.05/base/expat.mak 2012-03-29 08:27:52.554812021 +0000
222@@ -81,7 +81,7 @@
223 # Copy the target definition we want 18 # Copy the target definition we want
224 $(EXPATGEN)expat.dev : $(TOP_MAKEFILES) $(EXPAT_MAK) \ 19 $(EXPATGEN)expat.dev : $(TOP_MAKEFILES) $(EXPAT_MAK) \
225 $(EXPATGEN)expat_$(SHARE_EXPAT).dev 20 $(EXPATGEN)expat_$(SHARE_EXPAT).dev
@@ -228,11 +23,11 @@ Index: ghostscript-9.05/base/expat.mak
228 23
229 # Define the compiled in target 24 # Define the compiled in target
230 $(EXPATGEN)expat_0.dev : $(EXPAT_MAK) $(ECHOGS_XE) $(expat_) 25 $(EXPATGEN)expat_0.dev : $(EXPAT_MAK) $(ECHOGS_XE) $(expat_)
231Index: ghostscript-9.05/base/freetype.mak 26diff --git a/base/freetype.mak b/base/freetype.mak
232=================================================================== 27index 16f2b95..409f75b 100644
233--- ghostscript-9.05.orig/base/freetype.mak 2012-02-08 08:48:48.000000000 +0000 28--- a/base/freetype.mak
234+++ ghostscript-9.05/base/freetype.mak 2012-03-29 08:27:52.566812025 +0000 29+++ b/base/freetype.mak
235@@ -193,7 +193,7 @@ 30@@ -195,7 +195,7 @@ ft_winfonts=$(FTOBJ)winfnt.$(OBJ)
236 31
237 # instantiate the requested build option (shared or compiled in) 32 # instantiate the requested build option (shared or compiled in)
238 $(FTGEN)freetype.dev : $(TOP_MAKEFILES) $(FTGEN)freetype_$(SHARE_FT).dev 33 $(FTGEN)freetype.dev : $(TOP_MAKEFILES) $(FTGEN)freetype_$(SHARE_FT).dev
@@ -241,11 +36,24 @@ Index: ghostscript-9.05/base/freetype.mak
241 36
242 # Define the shared version. 37 # Define the shared version.
243 $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) 38 $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE)
244Index: ghostscript-9.05/base/ijs.mak 39diff --git a/base/gs.mak b/base/gs.mak
245=================================================================== 40index b804a3e..a343190 100644
246--- ghostscript-9.05.orig/base/ijs.mak 2012-02-08 08:48:48.000000000 +0000 41--- a/base/gs.mak
247+++ ghostscript-9.05/base/ijs.mak 2012-03-29 08:27:52.574812030 +0000 42+++ b/base/gs.mak
248@@ -64,7 +64,7 @@ 43@@ -433,7 +433,7 @@ $(gconfxx_h) : $(ld_tr)
44
45 $(gconfig_h) : $(gconfxx_h)
46 $(RM_) $(gconfig_h)
47- $(CP_) $(gconfxx_h) $(gconfig_h)
48+ $(CP_) $(gconfxx_h) $(gconfig_h) || true
49
50 # The line above is an empty command; don't delete.
51
52diff --git a/base/ijs.mak b/base/ijs.mak
53index bc6d549..0139e1c 100644
54--- a/base/ijs.mak
55+++ b/base/ijs.mak
56@@ -66,7 +66,7 @@ $(IJSGEN)ijslib_1.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(ECHOGS_XE)
249 57
250 58
251 $(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(IJSGEN)ijslib_$(SHARE_IJS).dev 59 $(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(IJSGEN)ijslib_$(SHARE_IJS).dev
@@ -254,24 +62,11 @@ Index: ghostscript-9.05/base/ijs.mak
254 62
255 63
256 ijs_h=$(IJSSRC)ijs.h 64 ijs_h=$(IJSSRC)ijs.h
257Index: ghostscript-9.05/base/jasper.mak 65diff --git a/base/jbig2.mak b/base/jbig2.mak
258=================================================================== 66index bb74630..44617a0 100644
259--- ghostscript-9.05.orig/base/jasper.mak 2012-02-08 08:48:48.000000000 +0000 67--- a/base/jbig2.mak
260+++ ghostscript-9.05/base/jasper.mak 2012-03-29 08:27:52.582812027 +0000 68+++ b/base/jbig2.mak
261@@ -164,7 +164,7 @@ 69@@ -98,7 +98,7 @@ JBIG2O_=$(O_)$(JBIG2OBJ)
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-02-08 08:48:47.000000000 +0000
273+++ ghostscript-9.05/base/jbig2.mak 2012-03-29 08:27:52.590812023 +0000
274@@ -96,7 +96,7 @@
275 70
276 # switch in the version of libjbig2.dev we're actually using 71 # switch in the version of libjbig2.dev we're actually using
277 $(JBIG2GEN)jbig2dec.dev : $(TOP_MAKEFILES) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev 72 $(JBIG2GEN)jbig2dec.dev : $(TOP_MAKEFILES) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev
@@ -280,11 +75,11 @@ Index: ghostscript-9.05/base/jbig2.mak
280 75
281 # dev file for shared (separately built) jbig2dec library 76 # dev file for shared (separately built) jbig2dec library
282 $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE) 77 $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE)
283Index: ghostscript-9.05/base/jpeg.mak 78diff --git a/base/jpeg.mak b/base/jpeg.mak
284=================================================================== 79index 5310a20..43cee63 100644
285--- ghostscript-9.05.orig/base/jpeg.mak 2012-02-08 08:48:48.000000000 +0000 80--- a/base/jpeg.mak
286+++ ghostscript-9.05/base/jpeg.mak 2012-03-29 08:27:52.602812026 +0000 81+++ b/base/jpeg.mak
287@@ -94,7 +94,7 @@ 82@@ -96,7 +96,7 @@ jconfig_h=$(GLGEN)jconfig.h
288 jmorecfg_h=$(GLGEN)jmorecfg.h 83 jmorecfg_h=$(GLGEN)jmorecfg.h
289 84
290 $(GLGEN)jconfig_.h : $(GLGEN)jconfig$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS) 85 $(GLGEN)jconfig_.h : $(GLGEN)jconfig$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS)
@@ -293,7 +88,7 @@ Index: ghostscript-9.05/base/jpeg.mak
293 88
294 $(GLGEN)jconfig0.h : $(ECHOGS_XE) $(GLSRC)gsjconf.h $(stdpre_h) $(MAKEFILE)\ 89 $(GLGEN)jconfig0.h : $(ECHOGS_XE) $(GLSRC)gsjconf.h $(stdpre_h) $(MAKEFILE)\
295 $(MAKEDIRS) 90 $(MAKEDIRS)
296@@ -106,13 +106,13 @@ 91@@ -108,13 +108,13 @@ $(GLGEN)jconfig1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS)
297 $(RMN_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h 92 $(RMN_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h
298 93
299 $(GLGEN)jconfig.h : $(GLGEN)jconfig0.h $(MAKEDIRS) 94 $(GLGEN)jconfig.h : $(GLGEN)jconfig0.h $(MAKEDIRS)
@@ -310,7 +105,7 @@ Index: ghostscript-9.05/base/jpeg.mak
310 $(RM_) $(GLGEN)jmorecf1.h 105 $(RM_) $(GLGEN)jmorecf1.h
311 106
312 $(GLGEN)jmorecf1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS) 107 $(GLGEN)jmorecf1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS)
313@@ -120,10 +120,10 @@ 108@@ -122,10 +122,10 @@ $(GLGEN)jmorecf1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS)
314 $(RMN_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h 109 $(RMN_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h
315 110
316 $(GLGEN)jmorecfg.h : $(GLGEN)jmorecf0.h $(MAKEDIRS) 111 $(GLGEN)jmorecfg.h : $(GLGEN)jmorecf0.h $(MAKEDIRS)
@@ -323,7 +118,7 @@ Index: ghostscript-9.05/base/jpeg.mak
323 118
324 # Contrary to what some portability bigots assert as fact, C compilers are 119 # Contrary to what some portability bigots assert as fact, C compilers are
325 # not consistent about where they start searching for #included files: 120 # not consistent about where they start searching for #included files:
326@@ -139,23 +139,23 @@ 121@@ -141,23 +141,23 @@ $(GLGEN)jmcorig.h : $(JSRC)jmorecfg.h $(MAKEDIRS)
327 JHCOPY=$(GLGEN)jinclude.h $(GLGEN)jpeglib.h 122 JHCOPY=$(GLGEN)jinclude.h $(GLGEN)jpeglib.h
328 123
329 $(GLGEN)jinclude.h : $(JSRC)jinclude.h $(MAKEDIRS) 124 $(GLGEN)jinclude.h : $(JSRC)jinclude.h $(MAKEDIRS)
@@ -351,7 +146,7 @@ Index: ghostscript-9.05/base/jpeg.mak
351 146
352 # In order to avoid having to keep the dependency lists for the IJG code 147 # 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 148 # accurate, we simply make all of them depend on the only files that
354@@ -172,40 +172,40 @@ 149@@ -174,40 +174,40 @@ $(JGEN)jpegc0.dev : $(JPEG_MAK) $(ECHOGS_XE) $(jpegc0_)
355 $(SETMOD) $(JGEN)jpegc0 $(jpegc0_) 150 $(SETMOD) $(JGEN)jpegc0 $(jpegc0_)
356 151
357 $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP) 152 $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP)
@@ -399,7 +194,7 @@ Index: ghostscript-9.05/base/jpeg.mak
399 194
400 jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ) 195 jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ)
401 196
402@@ -221,90 +221,90 @@ 197@@ -223,90 +223,90 @@ $(JGEN)jpege6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpege6) $(jpege
403 $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3) 198 $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3)
404 199
405 $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP) 200 $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP)
@@ -507,7 +302,7 @@ Index: ghostscript-9.05/base/jpeg.mak
507 302
508 jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ) 303 jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ)
509 304
510@@ -320,76 +320,76 @@ 305@@ -322,76 +322,76 @@ $(JGEN)jpegd6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpegd6) $(jpegd
511 $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3) 306 $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3)
512 307
513 $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP) 308 $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP)
@@ -599,11 +394,11 @@ Index: ghostscript-9.05/base/jpeg.mak
599+ $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c || true 394+ $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c || true
600 $(JCC) $(JO_)jdarith.$(OBJ) $(C_) $(GLGEN)jdarith.c 395 $(JCC) $(JO_)jdarith.$(OBJ) $(C_) $(GLGEN)jdarith.c
601 $(RM_) $(GLGEN)jdarith.c 396 $(RM_) $(GLGEN)jdarith.c
602Index: ghostscript-9.05/base/jpegxr.mak 397diff --git a/base/jpegxr.mak b/base/jpegxr.mak
603=================================================================== 398index 0f09a3a..36495dd 100644
604--- ghostscript-9.05.orig/base/jpegxr.mak 2012-02-08 08:48:48.000000000 +0000 399--- a/base/jpegxr.mak
605+++ ghostscript-9.05/base/jpegxr.mak 2012-03-29 08:27:52.606812026 +0000 400+++ b/base/jpegxr.mak
606@@ -100,7 +100,7 @@ 401@@ -103,7 +103,7 @@ $(JPEGXR_OBJ)x_strip.$(OBJ) : $(JPEGXR_SRC)x_strip.c $(jpegxr_hdrs)
607 # Copy the target definition we want 402 # Copy the target definition we want
608 $(JPEGXR_GEN)jpegxr.dev : $(TOP_MAKEFILES) $(JPEGXR_MAK) \ 403 $(JPEGXR_GEN)jpegxr.dev : $(TOP_MAKEFILES) $(JPEGXR_MAK) \
609 $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev 404 $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev
@@ -612,11 +407,11 @@ Index: ghostscript-9.05/base/jpegxr.mak
612 407
613 # Define the compiled in target 408 # Define the compiled in target
614 $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs) 409 $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs)
615Index: ghostscript-9.05/base/lcms.mak 410diff --git a/base/lcms.mak b/base/lcms.mak
616=================================================================== 411index dc7f9e5..2bccacd 100644
617--- ghostscript-9.05.orig/base/lcms.mak 2012-02-08 08:48:48.000000000 +0000 412--- a/base/lcms.mak
618+++ ghostscript-9.05/base/lcms.mak 2012-03-29 08:27:52.614812023 +0000 413+++ b/base/lcms.mak
619@@ -83,7 +83,7 @@ 414@@ -84,7 +84,7 @@ LCMSO_=$(O_)$(LCMSOBJ)
620 415
621 # switch in the version of lcms.dev we're actually using 416 # switch in the version of lcms.dev we're actually using
622 $(LCMSGEN)lcms.dev : $(TOP_MAKEFILES) $(LCMSGEN)lcms_$(SHARE_LCMS).dev 417 $(LCMSGEN)lcms.dev : $(TOP_MAKEFILES) $(LCMSGEN)lcms_$(SHARE_LCMS).dev
@@ -625,11 +420,11 @@ Index: ghostscript-9.05/base/lcms.mak
625 420
626 # dev file for shared (separately built) lcms library 421 # dev file for shared (separately built) lcms library
627 $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE) 422 $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE)
628Index: ghostscript-9.05/base/lcms2.mak 423diff --git a/base/lcms2.mak b/base/lcms2.mak
629=================================================================== 424index 4e25f2e..be29d06 100644
630--- ghostscript-9.05.orig/base/lcms2.mak 2012-02-08 08:48:48.000000000 +0000 425--- a/base/lcms2.mak
631+++ ghostscript-9.05/base/lcms2.mak 2012-03-29 08:27:52.626812023 +0000 426+++ b/base/lcms2.mak
632@@ -83,7 +83,7 @@ 427@@ -85,7 +85,7 @@ LCMS2O_=$(O_)$(LCMS2OBJ)
633 428
634 # switch in the version of lcms2.dev we're actually using 429 # switch in the version of lcms2.dev we're actually using
635 $(LCMS2GEN)lcms2.dev : $(TOP_MAKEFILES) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev 430 $(LCMS2GEN)lcms2.dev : $(TOP_MAKEFILES) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev
@@ -638,11 +433,11 @@ Index: ghostscript-9.05/base/lcms2.mak
638 433
639 # dev file for shared (separately built) lcms library 434 # dev file for shared (separately built) lcms library
640 $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE) 435 $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE)
641Index: ghostscript-9.05/base/lcups.mak 436diff --git a/base/lcups.mak b/base/lcups.mak
642=================================================================== 437index 0bfb3ac..fcdb170 100644
643--- ghostscript-9.05.orig/base/lcups.mak 2012-02-08 08:48:48.000000000 +0000 438--- a/base/lcups.mak
644+++ ghostscript-9.05/base/lcups.mak 2012-03-29 08:27:52.630812023 +0000 439+++ b/base/lcups.mak
645@@ -112,7 +112,7 @@ 440@@ -114,7 +114,7 @@ libcups.config-clean :
646 441
647 # instantiate the requested build option (shared or compiled in) 442 # instantiate the requested build option (shared or compiled in)
648 $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev 443 $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev
@@ -651,7 +446,7 @@ Index: ghostscript-9.05/base/lcups.mak
651 446
652 # Define the shared version. 447 # Define the shared version.
653 $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) 448 $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE)
654@@ -129,7 +129,7 @@ 449@@ -131,7 +131,7 @@ $(LIBCUPSGEN)lcups_0.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) \
655 # for simplicity we have every source file depend on all headers 450 # for simplicity we have every source file depend on all headers
656 451
657 $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h 452 $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h
@@ -660,7 +455,7 @@ Index: ghostscript-9.05/base/lcups.mak
660 455
661 $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h 456 $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h
662 $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c 457 $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c
663@@ -216,7 +216,7 @@ 458@@ -218,7 +218,7 @@ $(LIBCUPSOBJ)mark.$(OBJ) : $(LIBCUPSSRC)mark.c $(LIBSCUPSHEADERS)
664 $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c 459 $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c
665 460
666 $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS) 461 $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS)
@@ -669,7 +464,7 @@ Index: ghostscript-9.05/base/lcups.mak
669 $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c 464 $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c
670 465
671 $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS) 466 $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS)
672@@ -253,7 +253,7 @@ 467@@ -255,7 +255,7 @@ $(LIBCUPSOBJ)snmp.$(OBJ) : $(LIBCUPSSRC)snmp.c $(LIBSCUPSHEADERS)
673 $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c 468 $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c
674 469
675 $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS) 470 $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS)
@@ -678,18 +473,18 @@ Index: ghostscript-9.05/base/lcups.mak
678 $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c 473 $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c
679 474
680 $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS) 475 $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS)
681@@ -269,5 +269,5 @@ 476@@ -271,5 +271,5 @@ $(LIBCUPSOBJ)usersys.$(OBJ) : $(LIBCUPSSRC)usersys.c $(LIBSCUPSHEADERS)
682 $(LCUPS_CC) $(LCUPSO_)usersys.$(OBJ) $(C_) $(LIBCUPSSRC)usersys.c 477 $(LCUPS_CC) $(LCUPSO_)usersys.$(OBJ) $(C_) $(LIBCUPSSRC)usersys.c
683 478
684 $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS) 479 $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS)
685- $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c 480- $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c
686+ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true 481+ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true
687 $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c 482 $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c
688Index: ghostscript-9.05/base/lcupsi.mak 483diff --git a/base/lcupsi.mak b/base/lcupsi.mak
689=================================================================== 484index ae1ecff..96d4003 100644
690--- ghostscript-9.05.orig/base/lcupsi.mak 2012-02-08 08:48:48.000000000 +0000 485--- a/base/lcupsi.mak
691+++ ghostscript-9.05/base/lcupsi.mak 2012-03-29 08:27:52.642812024 +0000 486+++ b/base/lcupsi.mak
692@@ -71,7 +71,7 @@ 487@@ -73,7 +73,7 @@ libcupsi.config-clean :
693 488
694 # instantiate the requested build option (shared or compiled in) 489 # instantiate the requested build option (shared or compiled in)
695 $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev 490 $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev
@@ -698,11 +493,11 @@ Index: ghostscript-9.05/base/lcupsi.mak
698 493
699 # Define the shared version. 494 # Define the shared version.
700 $(LIBCUPSIGEN)lcupsi_1.dev : $(TOP_MAKEFILES) $(LCUPSI_MAK) $(ECHOGS_XE) 495 $(LIBCUPSIGEN)lcupsi_1.dev : $(TOP_MAKEFILES) $(LCUPSI_MAK) $(ECHOGS_XE)
701Index: ghostscript-9.05/base/ldf_jb2.mak 496diff --git a/base/ldf_jb2.mak b/base/ldf_jb2.mak
702=================================================================== 497index 3f50892..97c76a0 100644
703--- ghostscript-9.05.orig/base/ldf_jb2.mak 2012-02-08 08:48:48.000000000 +0000 498--- a/base/ldf_jb2.mak
704+++ ghostscript-9.05/base/ldf_jb2.mak 2012-03-29 08:27:52.650812024 +0000 499+++ b/base/ldf_jb2.mak
705@@ -222,7 +222,7 @@ 500@@ -223,7 +223,7 @@ ldf_jb2_HDRS=$(ldf_jb2_common_HDRS) $(ldf_jb2_compress_HDRS)
706 501
707 # switch in the selected library .dev 502 # 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 503 $(LDF_JB2_GEN)ldf_jb2.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev
@@ -711,11 +506,200 @@ Index: ghostscript-9.05/base/ldf_jb2.mak
711 506
712 # external link .dev 507 # external link .dev
713 $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) 508 $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE)
714Index: ghostscript-9.05/base/lwf_jp2.mak 509diff --git a/base/lib.mak b/base/lib.mak
715=================================================================== 510index 7c1677b..179fed0 100644
716--- ghostscript-9.05.orig/base/lwf_jp2.mak 2012-02-08 08:48:48.000000000 +0000 511--- a/base/lib.mak
717+++ ghostscript-9.05/base/lwf_jp2.mak 2012-03-29 08:27:52.654812024 +0000 512+++ b/base/lib.mak
718@@ -175,7 +175,7 @@ 513@@ -328,7 +328,7 @@ md5_=$(GLOBJ)md5.$(OBJ)
514 $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE)
515 $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22
516 $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h
517- $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c
518+ $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c || true
519 $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c
520 $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h
521
522@@ -598,19 +598,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\
523 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\
524 $(MAKEDDIRS)
525 $(RM_) $(GLGEN)gconfig.c
526- $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c
527+ $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true
528 $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c
529
530 $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\
531 $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS)
532 $(RM_) $(GLGEN)gscdefs.c
533- $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c
534+ $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c || true
535 $(GLCC) $(GLO_)gscdefs.$(OBJ) $(C_) $(GLGEN)gscdefs.c
536
537 $(AUX)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\
538 $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS)
539 $(RM_) $(AUX)gscdefs.c
540- $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c
541+ $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c || true
542 $(GLCCAUX) $(AUXO_)gscdefs.$(OBJ) $(C_) $(AUX)gscdefs.c
543
544 $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\
545@@ -1513,7 +1513,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\
546 $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c
547
548 $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ)
549- $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ)
550+ $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ) || true
551
552 # sdcparam is used by the filter operator and the PS/PDF writer.
553 # It is not included automatically in sdcte/d.
554@@ -1541,7 +1541,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\
555 $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c
556
557 $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
558- $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ)
559+ $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ) || true
560
561
562 $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
563@@ -1557,7 +1557,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
564 $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c
565
566 $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
567- $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ)
568+ $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ) || true
569
570 # sdeparam is used by the filter operator and the PS/PDF writer.
571 # It is not included automatically in sdcte.
572@@ -1589,7 +1589,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\
573 $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c
574
575 $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
576- $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ)
577+ $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ) || true
578
579
580 $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
581@@ -1606,7 +1606,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
582
583
584 $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
585- $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ)
586+ $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ) || true
587
588 # sddparam is used by the filter operator.
589 # It is not included automatically in sdctd.
590@@ -1629,7 +1629,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_)
591
592 # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory.
593 $(GLD)slzwe.dev : $(GLD)lzwe.dev
594- $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev
595+ $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev || true
596
597 $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\
598 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
599@@ -1645,7 +1645,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_)
600
601 # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory.
602 $(GLD)slzwd.dev : $(GLD)lzwd.dev
603- $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev
604+ $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev || true
605
606 $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\
607 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
608@@ -1695,7 +1695,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\
609 # ---------------- JBIG2 compression filter ---------------- #
610
611 $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev
612- $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev
613+ $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev || true
614
615 # jbig2dec version
616 sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ)
617@@ -1731,7 +1731,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \
618 # ---------------- JPEG 2000 compression filter ---------------- #
619
620 $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev
621- $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev
622+ $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev || true
623
624 $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
625 $(memory__h) $(gsmalloc_h) \
626@@ -1860,7 +1860,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\
627 $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c
628
629 $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
630- $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ)
631+ $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ) || true
632
633 szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ)
634 $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_)
635@@ -1876,7 +1876,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\
636 $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c
637
638 $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
639- $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ)
640+ $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ) || true
641
642 szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ)
643 $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_)
644@@ -1892,7 +1892,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\
645 $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c
646
647 $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
648- $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ)
649+ $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ) || true
650
651 # ---------------- Page devices ---------------- #
652 # We include this here, rather than in devs.mak, because it is more like
653@@ -2843,7 +2843,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\
654 $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c
655
656 $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ)
657- $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ)
658+ $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) || true
659
660
661 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
662@@ -2855,7 +2855,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
663 $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c
664
665 $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ)
666- $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ)
667+ $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true
668
669 # Note that gsicc_create requires compile with lcms to obtain icc34.h
670 # header file that is used for creating ICC structures from PS objects.
671@@ -2875,7 +2875,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\
672 $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
673
674 $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS)
675- $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ)
676+ $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ) || true
677
678
679 #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */
680@@ -3146,7 +3146,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS)
681 $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS)
682
683 $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS)
684- $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c
685+ $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c || true
686
687 # the following module is only included if the romfs.dev FEATURE is enabled
688 $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
689@@ -3162,7 +3162,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
690 $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c
691
692 $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
693- $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ)
694+ $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ) || true
695
696 $(GLOBJ)gsromfs1.$(OBJ) : $(GLOBJ)gsromfs1.c $(time__h) $(MAKEDIRS)
697 $(GLCC) $(GLO_)gsromfs1.$(OBJ) $(C_) $(GLOBJ)gsromfs1.c
698diff --git a/base/lwf_jp2.mak b/base/lwf_jp2.mak
699index ca1b7cc..ad6446d 100644
700--- a/base/lwf_jp2.mak
701+++ b/base/lwf_jp2.mak
702@@ -176,7 +176,7 @@ lwf_jp2_HDRS = \
719 703
720 # switch in the selected library .dev 704 # switch in the selected library .dev
721 $(LWF_JP2_GEN)lwf_jp2.dev : $(TOP_MAKEFILES) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev 705 $(LWF_JP2_GEN)lwf_jp2.dev : $(TOP_MAKEFILES) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev
@@ -724,11 +708,11 @@ Index: ghostscript-9.05/base/lwf_jp2.mak
724 708
725 # external link .dev 709 # external link .dev
726 $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) 710 $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE)
727Index: ghostscript-9.05/base/macos-mcp.mak 711diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak
728=================================================================== 712index 5387a99..725ec73 100644
729--- ghostscript-9.05.orig/base/macos-mcp.mak 2012-02-08 08:48:48.000000000 +0000 713--- a/base/macos-mcp.mak
730+++ ghostscript-9.05/base/macos-mcp.mak 2012-03-29 08:27:52.662812024 +0000 714+++ b/base/macos-mcp.mak
731@@ -384,11 +384,11 @@ 715@@ -380,11 +380,11 @@ CWPROJ_XML=./ghostscript.mcp.xml
732 716
733 $(CWPROJ_XML): $(gconfigd_h) 717 $(CWPROJ_XML): $(gconfigd_h)
734 -mkdir -p obj/sys 718 -mkdir -p obj/sys
@@ -744,12 +728,12 @@ Index: ghostscript-9.05/base/macos-mcp.mak
744 /Developer/Tools/SetFile -c CWIE -t TEXT $(CWPROJ_XML) 728 /Developer/Tools/SetFile -c CWIE -t TEXT $(CWPROJ_XML)
745 729
746 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) 730 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
747Index: ghostscript-9.05/base/openjpeg.mak 731diff --git a/base/openjpeg.mak b/base/openjpeg.mak
748=================================================================== 732index 489dd3b..60e2015 100644
749--- ghostscript-9.05.orig/base/openjpeg.mak 2012-02-08 08:48:48.000000000 +0000 733--- a/base/openjpeg.mak
750+++ ghostscript-9.05/base/openjpeg.mak 2012-03-29 08:27:52.662812024 +0000 734+++ b/base/openjpeg.mak
751@@ -86,11 +86,11 @@ 735@@ -94,11 +94,11 @@ open_jpeg_HDRS = \
752 $(OPEN_JPEG_SRC)tgt.h \ 736 $(OPEN_JPEG_SRC)indexbox_manager.h \
753 737
754 $(OPEN_JPEG_CONFIG_H): $(TOP_MAKEFILES) $(JPXSRCDIR)$(D)opj_config.h.in.user 738 $(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) 739- $(CP_) $(JPXSRCDIR)$(D)opj_config.h.in.user $(OPEN_JPEG_CONFIG_H)
@@ -762,11 +746,11 @@ Index: ghostscript-9.05/base/openjpeg.mak
762 746
763 # external link .dev 747 # external link .dev
764 $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) 748 $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE)
765Index: ghostscript-9.05/base/openvms.mak 749diff --git a/base/openvms.mak b/base/openvms.mak
766=================================================================== 750index 8e4c3dd..117dca4 100644
767--- ghostscript-9.05.orig/base/openvms.mak 2012-02-08 08:48:47.000000000 +0000 751--- a/base/openvms.mak
768+++ ghostscript-9.05/base/openvms.mak 2012-03-29 08:27:52.674812022 +0000 752+++ b/base/openvms.mak
769@@ -364,7 +364,7 @@ 753@@ -362,7 +362,7 @@ SH=
770 754
771 # Define generic commands. 755 # Define generic commands.
772 756
@@ -775,11 +759,20 @@ Index: ghostscript-9.05/base/openvms.mak
775 759
776 # Define the command for deleting (a) file(s) (including wild cards) 760 # Define the command for deleting (a) file(s) (including wild cards)
777 761
778Index: ghostscript-9.05/base/png.mak 762diff --git a/base/png.mak b/base/png.mak
779=================================================================== 763index 66fc3c8..59535be 100644
780--- ghostscript-9.05.orig/base/png.mak 2012-02-08 08:48:48.000000000 +0000 764--- a/base/png.mak
781+++ ghostscript-9.05/base/png.mak 2012-03-29 08:27:52.674812022 +0000 765+++ b/base/png.mak
782@@ -123,7 +123,7 @@ 766@@ -77,7 +77,7 @@ png.config-clean :
767 $(RM_) $(PNGGEN)lpg*.dev
768
769 $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt
770- $(CP_) $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt $(pnglibconf_h)
771+ $(CP_) $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt $(pnglibconf_h) || true
772
773 PDEP=$(AK) $(pnglibconf_h)
774
775@@ -132,7 +132,7 @@ $(PNGOBJ)pngget.$(OBJ) : $(PNGSRC)pngget.c $(PDEP)
783 776
784 # Define the version of libpng.dev that we are actually using. 777 # Define the version of libpng.dev that we are actually using.
785 $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev 778 $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev
@@ -788,11 +781,11 @@ Index: ghostscript-9.05/base/png.mak
788 781
789 # Define the shared version of libpng. 782 # Define the shared version of libpng.
790 # Note that it requires libz, which must be searched *after* libpng. 783 # Note that it requires libz, which must be searched *after* libpng.
791Index: ghostscript-9.05/base/tiff.mak 784diff --git a/base/tiff.mak b/base/tiff.mak
792=================================================================== 785index 22e3906..317fb14 100644
793--- ghostscript-9.05.orig/base/tiff.mak 2012-02-08 08:48:48.000000000 +0000 786--- a/base/tiff.mak
794+++ ghostscript-9.05/base/tiff.mak 2012-03-29 08:27:52.674812022 +0000 787+++ b/base/tiff.mak
795@@ -48,11 +48,11 @@ 788@@ -49,11 +49,11 @@ tiff_10=$(TIFFOBJ)tif_zip.$(OBJ)
796 789
797 $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in 790 $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in
798 cd $(TIFFSRC) && ./configure 791 cd $(TIFFSRC) && ./configure
@@ -806,7 +799,7 @@ Index: ghostscript-9.05/base/tiff.mak
806 799
807 $(TIFFOBJ)tif_aux.$(OBJ) : $(TIFFSRC)/libtiff/tif_aux.c $(TIFFDEP) 800 $(TIFFOBJ)tif_aux.$(OBJ) : $(TIFFSRC)/libtiff/tif_aux.c $(TIFFDEP)
808 $(TIFFCC) $(TIFFO_)tif_aux.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_aux.c 801 $(TIFFCC) $(TIFFO_)tif_aux.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_aux.c
809@@ -178,14 +178,14 @@ 802@@ -179,14 +179,14 @@ $(TIFFOBJ)tif_unix.$(OBJ) : $(TIFFSRC)/libtiff/tif_unix.c $(TIFFDEP)
810 $(TIFFCC) $(TIFFO_)tif_unix.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_unix.c 803 $(TIFFCC) $(TIFFO_)tif_unix.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_unix.c
811 804
812 $(TIFFGEN)tif_config.h: $(TIFFCONFIG) 805 $(TIFFGEN)tif_config.h: $(TIFFCONFIG)
@@ -824,24 +817,37 @@ Index: ghostscript-9.05/base/tiff.mak
824 817
825 818
826 # Define the shared version. 819 # Define the shared version.
827Index: ghostscript-9.05/base/unix-aux.mak 820diff --git a/base/unix-aux.mak b/base/unix-aux.mak
828=================================================================== 821index 1ddad78..6b24422 100644
829--- ghostscript-9.05.orig/base/unix-aux.mak 2012-03-21 17:51:12.106037764 +0000 822--- a/base/unix-aux.mak
830+++ ghostscript-9.05/base/unix-aux.mak 2012-03-29 08:27:52.674812022 +0000 823+++ b/base/unix-aux.mak
831@@ -105,7 +105,7 @@ 824@@ -105,7 +105,7 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\
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) 825 # $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
833 # 826 #
834 #$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) 827 #$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
835-# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) 828-# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
836+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) || true 829+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) || true
837 830
838 # Query the environment to construct gconfig_.h. 831 # Query the environment to construct gconfig_.h.
839 # The "else true;" is required because Ultrix's implementation of sh -e 832 # These are all defined conditionally (except the JasPER one), so that
840Index: ghostscript-9.05/base/zlib.mak 833diff --git a/base/unixhead.mak b/base/unixhead.mak
841=================================================================== 834index 67b5434..c4582c1 100644
842--- ghostscript-9.05.orig/base/zlib.mak 2012-02-08 08:48:47.000000000 +0000 835--- a/base/unixhead.mak
843+++ ghostscript-9.05/base/zlib.mak 2012-03-29 08:27:52.678812021 +0000 836+++ b/base/unixhead.mak
844@@ -82,7 +82,7 @@ 837@@ -55,7 +55,7 @@ SH=$(SHELL)
838
839 # Define generic commands.
840
841-CP_=cp
842+CP_=cp -f
843 RM_=rm -f
844 RMN_=rm -f
845
846diff --git a/base/zlib.mak b/base/zlib.mak
847index 6c50605..7fb8c9b 100644
848--- a/base/zlib.mak
849+++ b/base/zlib.mak
850@@ -83,7 +83,7 @@ $(ZOBJ)zutil.$(OBJ) : $(ZSRC)zutil.c $(ZDEP)
845 # Encoding (compression) code. 851 # Encoding (compression) code.
846 852
847 $(ZGEN)zlibe.dev : $(TOP_MAKEFILES) $(ZGEN)zlibe_$(SHARE_ZLIB).dev 853 $(ZGEN)zlibe.dev : $(TOP_MAKEFILES) $(ZGEN)zlibe_$(SHARE_ZLIB).dev
@@ -850,7 +856,7 @@ Index: ghostscript-9.05/base/zlib.mak
850 856
851 $(ZGEN)zlibe_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) 857 $(ZGEN)zlibe_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
852 $(SETMOD) $(ZGEN)zlibe_1 -lib $(ZLIB_NAME) 858 $(SETMOD) $(ZGEN)zlibe_1 -lib $(ZLIB_NAME)
853@@ -110,7 +110,7 @@ 859@@ -111,7 +111,7 @@ $(ZOBJ)trees.$(OBJ) : $(ZSRC)trees.c $(ZDEP)
854 # with 0.90 do. 860 # with 0.90 do.
855 861
856 $(ZGEN)crc32.dev : $(TOP_MAKEFILES) $(ZGEN)crc32_$(SHARE_ZLIB).dev 862 $(ZGEN)crc32.dev : $(TOP_MAKEFILES) $(ZGEN)crc32_$(SHARE_ZLIB).dev
@@ -859,7 +865,7 @@ Index: ghostscript-9.05/base/zlib.mak
859 865
860 $(ZGEN)crc32_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) 866 $(ZGEN)crc32_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
861 $(SETMOD) $(ZGEN)crc32_1 -lib $(ZLIB_NAME) 867 $(SETMOD) $(ZGEN)crc32_1 -lib $(ZLIB_NAME)
862@@ -126,7 +126,7 @@ 868@@ -127,7 +127,7 @@ $(ZOBJ)crc32.$(OBJ) : $(ZSRC)crc32.c $(ZDEP)
863 # Decoding (decompression) code. 869 # Decoding (decompression) code.
864 870
865 $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev 871 $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev
@@ -868,22 +874,20 @@ Index: ghostscript-9.05/base/zlib.mak
868 874
869 $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) 875 $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
870 $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) 876 $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME)
871Index: ghostscript-9.05/psi/int.mak 877diff --git a/psi/int.mak b/psi/int.mak
872=================================================================== 878index 92f296e..ee6b136 100644
873--- ghostscript-9.05.orig/psi/int.mak 2012-03-29 08:28:53.942810602 +0000 879--- a/psi/int.mak
874+++ ghostscript-9.05/psi/int.mak 2012-03-29 08:29:05.814797444 +0000 880+++ b/psi/int.mak
875@@ -272,8 +272,8 @@ 881@@ -274,7 +274,7 @@ $(PSOBJ)iconfig.$(OBJ) : $(gconfig_h) $(PSSRC)iconf.c $(stdio__h)\
876 $(gconf_h) $(gconfigd_h) $(gsmemory_h) $(gstypes_h)\ 882 $(gconf_h) $(gconfigd_h) $(gsmemory_h) $(gstypes_h)\
877 $(iminst_h) $(iref_h) $(ivmspace_h) $(opdef_h) $(iplugin_h) 883 $(iminst_h) $(iref_h) $(ivmspace_h) $(opdef_h) $(iplugin_h)
878 $(RM_) $(PSGEN)iconfig.c 884 $(RM_) $(PSGEN)iconfig.c
879- $(CP_) $(gconfig_h) $(PSGEN)gconfig.h
880- $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c 885- $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c
881+ $(CP_) $(gconfig_h) $(PSGEN)gconfig.h || true
882+ $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c || true 886+ $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c || true
883 $(PSCC) $(PSO_)iconfig.$(OBJ) $(C_) $(PSGEN)iconfig.c 887 $(PSCC) $(PSO_)iconfig.$(OBJ) $(C_) $(PSGEN)iconfig.c
884 888
885 $(PSOBJ)iinit.$(OBJ) : $(PSSRC)iinit.c $(GH) $(string__h)\ 889 $(PSOBJ)iinit.$(OBJ) : $(PSSRC)iinit.c $(GH) $(string__h)\
886@@ -605,7 +605,7 @@ 890@@ -607,7 +607,7 @@ $(PSD)psbase.dev : $(INT_MAK) $(ECHOGS_XE) $(INT_OBJS)\
887 891
888 # We keep the old name for backward compatibility. 892 # We keep the old name for backward compatibility.
889 $(PSD)level1.dev : $(PSD)psl1.dev 893 $(PSD)level1.dev : $(PSD)psl1.dev
@@ -892,7 +896,7 @@ Index: ghostscript-9.05/psi/int.mak
892 896
893 $(PSD)psl1.dev : $(INT_MAK) $(ECHOGS_XE)\ 897 $(PSD)psl1.dev : $(INT_MAK) $(ECHOGS_XE)\
894 $(PSD)psbase.dev $(PSD)bcp.dev $(PSD)path1.dev $(PSD)type1.dev 898 $(PSD)psbase.dev $(PSD)bcp.dev $(PSD)path1.dev $(PSD)type1.dev
895@@ -931,7 +931,7 @@ 899@@ -934,7 +934,7 @@ $(PSOBJ)zfrsd.$(OBJ) : $(PSSRC)zfrsd.c $(OP) $(memory__h)\
896 900
897 # We keep the old name for backward compatibility. 901 # We keep the old name for backward compatibility.
898 $(PSD)level2.dev : $(PSD)psl2.dev 902 $(PSD)level2.dev : $(PSD)psl2.dev
@@ -901,12 +905,12 @@ Index: ghostscript-9.05/psi/int.mak
901 905
902 # We -include dpsand2 first so that geninit will have access to the 906 # We -include dpsand2 first so that geninit will have access to the
903 # system name table as soon as possible. 907 # system name table as soon as possible.
904@@ -1205,7 +1205,7 @@ 908@@ -1208,7 +1208,7 @@ $(PSOBJ)zfjbig2_luratech.$(OBJ) : $(PSSRC)zfjbig2.c $(OP) $(memory__h)\
905 # this can be turned on and off with a FEATURE_DEV 909 # this can be turned on and off with a FEATURE_DEV
906 910
907 $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev 911 $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev
908- $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev 912- $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev
909+ $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev || true 913+ $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev || true
910 914
911 fjpx_jasper=$(PSOBJ)zfjpx.$(OBJ) 915 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ)
912 916
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
index c37e4c40a4..db8740affa 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
@@ -1,95 +1,96 @@
1Just use commands provided by ghostscript-native, preventing recompile them when 1ust use commands provided by ghostscript-native, preventing recompile them when
2compile ghostscript. 2compile ghostscript.
3Way to enable cross compile. 3Way to enable cross compile.
4 4
5Upstream-Status: Pending 5Upstream-Status: Pending
6 6
7Signed-off-by: Kang Kai <kai.kang@windriver.com> 7Signed-off-by: Kang Kai <kai.kang@windriver.com>
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
8 9
9--- a/base/unix-aux.mak.orig 2011-10-17 16:12:20.354167007 +0800 10diff --git a/base/unix-aux.mak b/base/unix-aux.mak
10+++ a/base/unix-aux.mak 2011-10-17 16:16:26.774167008 +0800 11index c032b3f..1ddad78 100644
11@@ -67,45 +67,45 @@ 12--- a/base/unix-aux.mak
13+++ b/base/unix-aux.mak
14@@ -68,44 +68,44 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\
12 15
13 # -------------------------- Auxiliary programs --------------------------- # 16 # -------------------------- Auxiliary programs --------------------------- #
14 17
15-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) 18-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
16- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c 19- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
17- 20-
18-# On the RS/6000 (at least), compiling genarch.c with gcc with -O 21-# On the RS/6000 (at least), compiling genarch.c with gcc with -O
19-# produces a buggy executable. 22-# produces a buggy executable.
20-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS) 23-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
21- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c 24- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
22- 25-
23-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) 26-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS)
24- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c 27- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
25- 28-
26-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) 29-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS)
27- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c 30- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
28- 31-
29-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) 32-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS)
30- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c 33- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
31- 34-
32-# To get GS to use the system zlib, you remove/hide the gs/zlib directory 35-# To get GS to use the system zlib, you remove/hide the gs/zlib directory
33-# which means that the mkromfs build can't find the zlib source it needs. 36-# which means that the mkromfs build can't find the zlib source it needs.
34-# So it's split into two targets, one using the zlib source directly..... 37-# So it's split into two targets, one using the zlib source directly.....
35-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gscdefs.$(OBJ) $(AUX)gsmisc.$(OBJ) \ 38-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
36- $(AUX)gpmisc.$(OBJ) $(AUX)gslibctx.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ 39- $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
37- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
38- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) 40- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
39- 41-
40-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) 42-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0)
41- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS) 43- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
42- 44-
43-# .... and one using the zlib library linked via the command line 45-# .... and one using the zlib library linked via the command line
44-MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ 46-MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
45- $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \ 47- $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
46- $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \ 48- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
47- $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) 49- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
48- 50-
49-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) 51-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1)
50- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) 52- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
51- 53-
52-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) 54-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
53- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) 55- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
54+#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) 56+#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
55+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c 57+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
56+# 58+#
57+## On the RS/6000 (at least), compiling genarch.c with gcc with -O 59+## On the RS/6000 (at least), compiling genarch.c with gcc with -O
58+## produces a buggy executable. 60+## produces a buggy executable.
59+#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS) 61+#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
60+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c 62+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
61+# 63+#
62+#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) 64+#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS)
63+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c 65+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
64+# 66+#
65+#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) 67+#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS)
66+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c 68+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
67+# 69+#
68+#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) 70+#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS)
69+# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c 71+# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
70+# 72+#
71+## To get GS to use the system zlib, you remove/hide the gs/zlib directory 73+## To get GS to use the system zlib, you remove/hide the gs/zlib directory
72+## which means that the mkromfs build can't find the zlib source it needs. 74+## which means that the mkromfs build can't find the zlib source it needs.
73+## So it's split into two targets, one using the zlib source directly..... 75+## So it's split into two targets, one using the zlib source directly.....
74+#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gscdefs.$(OBJ) $(AUX)gsmisc.$(OBJ) \ 76+#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
75+# $(AUX)gpmisc.$(OBJ) $(AUX)gslibctx.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ 77+# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
76+# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
77+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) 78+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
78+# 79+#
79+#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) 80+#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0)
80+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS) 81+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
81+# 82+#
82+## .... and one using the zlib library linked via the command line 83+## .... and one using the zlib library linked via the command line
83+#MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ 84+#MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
84+# $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \ 85+# $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
85+# $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \ 86+# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
86+# $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) 87+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
87+# 88+#
88+#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) 89+#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1)
89+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) 90+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
90+# 91+#
91+#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) 92+#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
92+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) 93+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
93 94
94 # Query the environment to construct gconfig_.h. 95 # Query the environment to construct gconfig_.h.
95 # The "else true;" is required because Ultrix's implementation of sh -e 96 # These are all defined conditionally (except the JasPER one), so that
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
index c79063f7c1..f78387dc02 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
@@ -5,10 +5,11 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Kang Kai <kai.kang@windriver.com> 6Signed-off-by: Kang Kai <kai.kang@windriver.com>
7Signed-off-by: Sen Zhang <sen.zhang@windriver.com> 7Signed-off-by: Sen Zhang <sen.zhang@windriver.com>
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
8 9
9--- ghostscript-9.05/base/configure.ac.orig 2013-01-06 10:02:08.699479511 +0800 10--- base/configure.ac.orig 2013-06-24 03:58:26.224723002 -0400
10+++ ghostscript-9.05/base/configure.ac 2013-01-06 10:01:52.275382106 +0800 11+++ base/configure.ac 2013-06-24 04:03:29.730807957 -0400
11@@ -1741,13 +1741,13 @@ 12@@ -255,13 +255,13 @@
12 13
13 AC_MSG_CHECKING([for big endian]) 14 AC_MSG_CHECKING([for big endian])
14 15
@@ -17,16 +18,27 @@ Signed-off-by: Sen Zhang <sen.zhang@windriver.com>
17- static const int one = 1; 18- static const int one = 1;
18- return (*(char*)&one == 0 ? 0 : 1); 19- return (*(char*)&one == 0 ? 0 : 1);
19- ])], 20- ])],
20- [LCMS_BIGENDIAN=1], 21- [BIGENDIAN=1;AC_MSG_RESULT(big)],
21- [LCMS_BIGENDIAN=0]) 22- [BIGENDIAN=0;AC_MSG_RESULT(little)])
22+dnl AC_RUN_IFELSE( 23+#AC_RUN_IFELSE(
23+dnl [AC_LANG_PROGRAM([#include <stdio.h>], [ 24+# [AC_LANG_PROGRAM([#include <stdio.h>], [
24+dnl static const int one = 1; 25+# static const int one = 1;
25+dnl return (*(char*)&one == 0 ? 0 : 1); 26+# return (*(char*)&one == 0 ? 0 : 1);
26+dnl ])], 27+# ])],
27+dnl [LCMS_BIGENDIAN=1], 28+# [BIGENDIAN=1;AC_MSG_RESULT(big)],
28+dnl [LCMS_BIGENDIAN=0]) 29+# [BIGENDIAN=0;AC_MSG_RESULT(little)])
29 30
30 if test "x$LCMS_BIGENDIAN" != "x0"; then 31
31 LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN" 32
32 33@@ -1922,9 +1922,11 @@
34 if test "x$BIGENDIAN" != "x0"; then
35 LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$BIGENDIAN"
36 LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$BIGENDIAN"
37+ AC_MSG_RESULT(big)
38 else
39 LCMS_ENDIAN=
40 LCMS2_ENDIAN=
41+ AC_MSG_RESULT(little)
42 fi
43
44 AC_SUBST(LCMS_ENDIAN)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
index ce254f6ece..40afd372d1 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
@@ -11,38 +11,37 @@ diff --git a/base/configure.ac b/base/configure.ac
11index bb05105..4b817ac 100644 11index bb05105..4b817ac 100644
12--- a/base/configure.ac 12--- a/base/configure.ac
13+++ b/base/configure.ac 13+++ b/base/configure.ac
14@@ -814,17 +814,23 @@ Disabling tiff output devices.]) 14@@ -951,17 +951,22 @@
15 esac 15 esac
16 16
17 if test $SHARE_LIBTIFF -eq 0; then 17 if test $SHARE_LIBTIFF -eq 0; then
18- echo 18- echo
19- echo "Running libtiff configure script..." 19- echo "Running libtiff configure script..."
20- olddir=`pwd` 20- olddir=`pwd`
21- cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS 21- cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS
22- status=$? 22- status=$?
23- if test "$status" -ne 0 ; then 23- if test "$status" -ne 0 ; then
24- AC_MSG_ERROR([libtiff configure script failed], $status) 24- AC_MSG_ERROR([libtiff configure script failed], $status)
25- fi 25- fi
26- cd $olddir 26- cd "$olddir"
27- echo 27- echo
28- echo "Continuing with Ghostscript configuration..." 28- echo "Continuing with Ghostscript configuration..."
29+ if test -e $LIBTIFFDIR/configure; then 29+ if test -e $LIBTIFFDIR/configure; then
30+ echo 30+ echo
31+ echo "Running libtiff configure script..." 31+ echo "Running libtiff configure script..."
32+ olddir=`pwd` 32+ olddir=`pwd`
33+ cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS 33+ cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS
34+ status=$? 34+ status=$?
35+ if test "$status" -ne 0 ; then 35+ if test "$status" -ne 0 ; then
36+ AC_MSG_ERROR([libtiff configure script failed], $status) 36+ AC_MSG_ERROR([libtiff configure script failed], $status)
37+ fi 37+ fi
38+ cd $olddir 38+ cd "$olddir"
39+ echo 39+ echo
40+ echo "Continuing with Ghostscript configuration..." 40+ echo "Continuing with Ghostscript configuration..."
41+ else 41+ else
42+ AC_MSG_NOTICE([Could not find local copy of libtiff. 42+ AC_MSG_NOTICE([Could not find local copy of libtiff.
43+Disabling tiff output devices.]) 43+Disabling tiff output devices.])
44+ fi 44+ fi
45+
46 fi 45 fi
47 46
48 AC_SUBST(SHARE_LIBTIFF) 47 AC_SUBST(SHARE_LIBTIFF)
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.07.bb
index 9ec57120b6..bd4dd75ffc 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.07.bb
@@ -13,9 +13,7 @@ HOMEPAGE = "http://www.ghostscript.com"
13SECTION = "console/utils" 13SECTION = "console/utils"
14 14
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=a5146dadaa8cd9f5f913b7577d49bf19"
17
18PR = "r6"
19 17
20DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" 18DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
21DEPENDS_class-native = "" 19DEPENDS_class-native = ""
@@ -31,12 +29,11 @@ SRC_URI = "${SRC_URI_BASE} \
31 " 29 "
32 30
33SRC_URI_class-native = "${SRC_URI_BASE} \ 31SRC_URI_class-native = "${SRC_URI_BASE} \
34 file://0001-make-ghostscript-work-with-long-building-directory.patch \
35 file://ghostscript-native-fix-disable-system-libtiff.patch \ 32 file://ghostscript-native-fix-disable-system-libtiff.patch \
36 " 33 "
37 34
38SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1" 35SRC_URI[md5sum] = "57ebf17c5abcf0fc95a386bfff08c1a4"
39SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207" 36SRC_URI[sha256sum] = "44800d004c53f13192d1b5db413119198ddfc8a11c4d2a030aac2f2fda822ebf"
40 37
41EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \ 38EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \
42 --with-fontpath=${datadir}/fonts --with-install-cups --without-libidn" 39 --with-fontpath=${datadir}/fonts --with-install-cups --without-libidn"
@@ -64,11 +61,11 @@ do_configure_prepend () {
64 cp ${WORKDIR}/objarch.h obj/arch.h 61 cp ${WORKDIR}/objarch.h obj/arch.h
65 fi 62 fi
66 if [ ${SITEINFO_ENDIANNESS} = "le" ]; then 63 if [ ${SITEINFO_ENDIANNESS} = "le" ]; then
67 export LCMS_BIGENDIAN="0" 64 export BIGENDIAN="0"
68 export LCMS2_BIGENDIAN="0" 65 export BIGENDIAN="0"
69 else 66 else
70 export LCMS_BIGENDIAN="1" 67 export BIGENDIAN="1"
71 export LCMS2_BIGENDIAN="1" 68 export BIGENDIAN="1"
72 fi 69 fi
73} 70}
74 71
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-18 00:22:37 +0000