diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-05-04 08:32:35 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:43:59 +0100 |
| commit | 5f165e1314f9075b0bdd75486e1a24785ed98287 (patch) | |
| tree | f1f6375722bcfbd843126b240f9bd1d4726bdb6a | |
| parent | 109d670e5d189d4ba7ae8b4dbd3d53a549a31875 (diff) | |
| download | poky-5f165e1314f9075b0bdd75486e1a24785ed98287.tar.gz | |
ghostscript: 9.15 -> 9.16
* Update LICENSE's md5sum, the new version added a "of" in the file, the
license is the same.
* Remove ghostscript-9.02-parallel-make.patch, it has 932 lines and
modified 24 files, which is hard to maintain, and it can't be applied
since the code has changed, and if we meet parallel issues again, we
need fix it in other ways.
* Fix a build error of -Werror=return-type.
(From OE-Core rev: c5adb5903bd93f1c71acd52062d8c8620de2f944)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch | 932 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.16.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.15.bb) | 15 |
4 files changed, 49 insertions, 948 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 deleted file mode 100644 index ae9da6e08e..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch +++ /dev/null | |||
| @@ -1,932 +0,0 @@ | |||
| 1 | When parallel make it will fail with multi copy, see | ||
| 2 | http://bugzilla.pokylinux.org/show_bug.cgi?id=1202 | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | |||
| 6 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | ||
| 7 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
| 8 | |||
| 9 | RP: Extended || true to all CP_ operations, they all can race e.g.: | ||
| 10 | | cp -f ./obj/gconfxx.h ./obj/gconfig.h | ||
| 11 | | cp: cannot create regular file `./obj/gconfig.h': File exists | ||
| 12 | |||
| 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 14 | |||
| 15 | Rebase the patch to ghostscript-9.15 | ||
| 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 17 | |||
| 18 | diff --git a/base/expat.mak b/base/expat.mak | ||
| 19 | index 4ee9c8c..2e16a9d 100644 | ||
| 20 | --- a/base/expat.mak | ||
| 21 | +++ b/base/expat.mak | ||
| 22 | @@ -82,7 +82,7 @@ $(EXPATOBJ)xmltok.$(OBJ) : $(EXPATSRC)xmltok.c $(expat_xmltok_hdrs) | ||
| 23 | # Copy the target definition we want | ||
| 24 | $(EXPATGEN)expat.dev : $(TOP_MAKEFILES) $(EXPAT_MAK) \ | ||
| 25 | $(EXPATGEN)expat_$(SHARE_EXPAT).dev | ||
| 26 | - $(CP_) $(EXPATGEN)expat_$(SHARE_EXPAT).dev $(EXPATGEN)expat.dev | ||
| 27 | + $(CP_) $(EXPATGEN)expat_$(SHARE_EXPAT).dev $(EXPATGEN)expat.dev || true | ||
| 28 | |||
| 29 | # Define the compiled in target | ||
| 30 | $(EXPATGEN)expat_0.dev : $(EXPAT_MAK) $(ECHOGS_XE) $(expat_) | ||
| 31 | diff --git a/base/freetype.mak b/base/freetype.mak | ||
| 32 | index 16f2b95..409f75b 100644 | ||
| 33 | --- a/base/freetype.mak | ||
| 34 | +++ b/base/freetype.mak | ||
| 35 | @@ -195,7 +195,7 @@ ft_winfonts=$(FTOBJ)winfnt.$(OBJ) | ||
| 36 | |||
| 37 | # instantiate the requested build option (shared or compiled in) | ||
| 38 | $(FTGEN)freetype.dev : $(TOP_MAKEFILES) $(FTGEN)freetype_$(SHARE_FT).dev | ||
| 39 | - $(CP_) $(FTGEN)freetype_$(SHARE_FT).dev $(FTGEN)freetype.dev | ||
| 40 | + $(CP_) $(FTGEN)freetype_$(SHARE_FT).dev $(FTGEN)freetype.dev || true | ||
| 41 | |||
| 42 | # Define the shared version. | ||
| 43 | $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) | ||
| 44 | diff --git a/base/gs.mak b/base/gs.mak | ||
| 45 | index 3fc67df..1fc3e26 100644 | ||
| 46 | --- a/base/gs.mak | ||
| 47 | +++ b/base/gs.mak | ||
| 48 | @@ -434,7 +434,7 @@ $(gconfxx_h) : $(ld_tr) | ||
| 49 | |||
| 50 | $(gconfig_h) : $(gconfxx_h) | ||
| 51 | $(RM_) $(gconfig_h) | ||
| 52 | - $(CP_) $(gconfxx_h) $(gconfig_h) | ||
| 53 | + $(CP_) $(gconfxx_h) $(gconfig_h) || true | ||
| 54 | |||
| 55 | # The line above is an empty command; don't delete. | ||
| 56 | |||
| 57 | diff --git a/base/ijs.mak b/base/ijs.mak | ||
| 58 | index bc6d549..0139e1c 100644 | ||
| 59 | --- a/base/ijs.mak | ||
| 60 | +++ b/base/ijs.mak | ||
| 61 | @@ -66,7 +66,7 @@ $(IJSGEN)ijslib_1.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(ECHOGS_XE) | ||
| 62 | |||
| 63 | |||
| 64 | $(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(IJSGEN)ijslib_$(SHARE_IJS).dev | ||
| 65 | - $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev | ||
| 66 | + $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev || true | ||
| 67 | |||
| 68 | |||
| 69 | ijs_h=$(IJSSRC)ijs.h | ||
| 70 | diff --git a/base/jbig2.mak b/base/jbig2.mak | ||
| 71 | index bb74630..44617a0 100644 | ||
| 72 | --- a/base/jbig2.mak | ||
| 73 | +++ b/base/jbig2.mak | ||
| 74 | @@ -98,7 +98,7 @@ JBIG2O_=$(O_)$(JBIG2OBJ) | ||
| 75 | |||
| 76 | # switch in the version of libjbig2.dev we're actually using | ||
| 77 | $(JBIG2GEN)jbig2dec.dev : $(TOP_MAKEFILES) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev | ||
| 78 | - $(CP_) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev $(JBIG2GEN)jbig2dec.dev | ||
| 79 | + $(CP_) $(JBIG2GEN)jbig2dec_$(SHARE_JBIG2).dev $(JBIG2GEN)jbig2dec.dev || true | ||
| 80 | |||
| 81 | # dev file for shared (separately built) jbig2dec library | ||
| 82 | $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE) | ||
| 83 | diff --git a/base/jpeg.mak b/base/jpeg.mak | ||
| 84 | index e300a04..9fdad5a 100644 | ||
| 85 | --- a/base/jpeg.mak | ||
| 86 | +++ b/base/jpeg.mak | ||
| 87 | @@ -96,7 +96,7 @@ jconfig_h=$(GLGEN)jconfig.h | ||
| 88 | jmorecfg_h=$(GLGEN)jmorecfg.h | ||
| 89 | |||
| 90 | $(GLGEN)jconfig_.h : $(GLGEN)jconfig$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS) | ||
| 91 | - $(CP_) $(GLGEN)jconfig$(SHARE_JPEG).h $(GLGEN)jconfig_.h | ||
| 92 | + $(CP_) $(GLGEN)jconfig$(SHARE_JPEG).h $(GLGEN)jconfig_.h || true | ||
| 93 | |||
| 94 | $(GLGEN)jconfig0.h : $(ECHOGS_XE) $(GLSRC)gsjconf.h $(stdpre_h) $(MAKEFILE)\ | ||
| 95 | $(MAKEDIRS) | ||
| 96 | @@ -108,13 +108,13 @@ $(GLGEN)jconfig1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS) | ||
| 97 | $(RMN_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h | ||
| 98 | |||
| 99 | $(GLGEN)jconfig.h : $(GLGEN)jconfig0.h $(MAKEDIRS) | ||
| 100 | - $(CP_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h | ||
| 101 | + $(CP_) $(GLGEN)jconfig0.h $(GLGEN)jconfig.h || true | ||
| 102 | |||
| 103 | $(GLGEN)jmorecf_.h : $(GLGEN)jmorecf$(SHARE_JPEG).h $(MAKEFILE) $(MAKEDIRS) | ||
| 104 | - $(CP_) $(GLGEN)jmorecf$(SHARE_JPEG).h $(GLGEN)jmorecf_.h | ||
| 105 | + $(CP_) $(GLGEN)jmorecf$(SHARE_JPEG).h $(GLGEN)jmorecf_.h || true | ||
| 106 | |||
| 107 | $(GLGEN)jmorecf0.h : $(GLSRC)gsjmorec.h $(GLGEN)jmcorig.h $(MAKEDIRS) | ||
| 108 | - $(CP_) $(GLSRC)gsjmorec.h $(GLGEN)jmorecf0.h | ||
| 109 | + $(CP_) $(GLSRC)gsjmorec.h $(GLGEN)jmorecf0.h || true | ||
| 110 | $(RM_) $(GLGEN)jmorecf1.h | ||
| 111 | |||
| 112 | $(GLGEN)jmorecf1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS) | ||
| 113 | @@ -122,10 +122,10 @@ $(GLGEN)jmorecf1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS) | ||
| 114 | $(RMN_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h | ||
| 115 | |||
| 116 | $(GLGEN)jmorecfg.h : $(GLGEN)jmorecf0.h $(MAKEDIRS) | ||
| 117 | - $(CP_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h | ||
| 118 | + $(CP_) $(GLGEN)jmorecf0.h $(GLGEN)jmorecfg.h || true | ||
| 119 | |||
| 120 | $(GLGEN)jmcorig.h : $(JSRC)jmorecfg.h $(MAKEDIRS) | ||
| 121 | - $(CP_) $(JSRC)jmorecfg.h $(GLGEN)jmcorig.h | ||
| 122 | + $(CP_) $(JSRC)jmorecfg.h $(GLGEN)jmcorig.h || true | ||
| 123 | |||
| 124 | # Contrary to what some portability bigots assert as fact, C compilers are | ||
| 125 | # not consistent about where they start searching for #included files: | ||
| 126 | @@ -141,23 +141,23 @@ $(GLGEN)jmcorig.h : $(JSRC)jmorecfg.h $(MAKEDIRS) | ||
| 127 | JHCOPY=$(GLGEN)jinclude.h $(GLGEN)jpeglib.h | ||
| 128 | |||
| 129 | $(GLGEN)jinclude.h : $(JSRC)jinclude.h $(MAKEDIRS) | ||
| 130 | - $(CP_) $(JSRC)jinclude.h $(GLGEN)jinclude.h | ||
| 131 | + $(CP_) $(JSRC)jinclude.h $(GLGEN)jinclude.h || true | ||
| 132 | |||
| 133 | # jpeglib_.h doesn't really depend on jconfig.h or jmcorig.h, | ||
| 134 | # but we choose to put the dependencies here rather than in the | ||
| 135 | # definition of jpeglib__h. | ||
| 136 | $(GLGEN)jpeglib_.h : $(GLGEN)jpeglib$(SHARE_JPEG).h $(MAKEDIRS) | ||
| 137 | - $(CP_) $(GLGEN)jpeglib$(SHARE_JPEG).h $(GLGEN)jpeglib_.h | ||
| 138 | + $(CP_) $(GLGEN)jpeglib$(SHARE_JPEG).h $(GLGEN)jpeglib_.h || true | ||
| 139 | |||
| 140 | $(GLGEN)jpeglib0.h : $(JSRC)jpeglib.h $(jconfig_h) $(jmorecfg_h) $(MAKEDIRS) | ||
| 141 | - $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib0.h | ||
| 142 | + $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib0.h || true | ||
| 143 | |||
| 144 | $(GLGEN)jpeglib1.h : $(ECHOGS_XE) $(JPEG_MAK) $(MAKEDIRS) | ||
| 145 | $(EXP)$(ECHOGS_XE) -w $(GLGEN)jpeglib1.h -x 23 include -x 203c jpeglib.h -x 3e | ||
| 146 | |||
| 147 | # We also need jpeglib.h for #includes in the library itself. | ||
| 148 | $(GLGEN)jpeglib.h : $(JSRC)jpeglib.h $(MAKEDIRS) | ||
| 149 | - $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib.h | ||
| 150 | + $(CP_) $(JSRC)jpeglib.h $(GLGEN)jpeglib.h || true | ||
| 151 | |||
| 152 | # In order to avoid having to keep the dependency lists for the IJG code | ||
| 153 | # accurate, we simply make all of them depend on the only files that | ||
| 154 | @@ -181,40 +181,40 @@ $(JGEN)jpegc0.dev : $(JPEG_MAK) $(ECHOGS_XE) $(jpegc0_) | ||
| 155 | $(SETMOD) $(JGEN)jpegc0 $(jpegc0_) | ||
| 156 | |||
| 157 | $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP) | ||
| 158 | - $(CP_) $(JSRC)jcomapi.c $(GLGEN)jcomapi.c | ||
| 159 | + $(CP_) $(JSRC)jcomapi.c $(GLGEN)jcomapi.c || true | ||
| 160 | $(JCC) $(JO_)jcomapi.$(OBJ) $(C_) $(GLGEN)jcomapi.c | ||
| 161 | $(RM_) $(GLGEN)jcomapi.c | ||
| 162 | |||
| 163 | $(JOBJ)jutils.$(OBJ) : $(JSRC)jutils.c $(JDEP) | ||
| 164 | - $(CP_) $(JSRC)jutils.c $(GLGEN)jutils.c | ||
| 165 | + $(CP_) $(JSRC)jutils.c $(GLGEN)jutils.c || true | ||
| 166 | $(JCC) $(JO_)jutils.$(OBJ) $(C_) $(GLGEN)jutils.c | ||
| 167 | $(RM_) $(GLGEN)jutils.c | ||
| 168 | |||
| 169 | $(JOBJ)jmemmgr.$(OBJ) : $(JSRC)jmemmgr.c $(JDEP) | ||
| 170 | - $(CP_) $(JSRC)jmemmgr.c $(GLGEN)jmemmgr.c | ||
| 171 | + $(CP_) $(JSRC)jmemmgr.c $(GLGEN)jmemmgr.c || true | ||
| 172 | $(JCC) $(JO_)jmemmgr.$(OBJ) $(C_) $(GLGEN)jmemmgr.c | ||
| 173 | $(RM_) $(GLGEN)jmemmgr.c | ||
| 174 | |||
| 175 | $(JOBJ)jerror.$(OBJ) : $(JSRC)jerror.c $(JDEP) | ||
| 176 | - $(CP_) $(JSRC)jerror.c $(GLGEN)jerror.c | ||
| 177 | + $(CP_) $(JSRC)jerror.c $(GLGEN)jerror.c || true | ||
| 178 | $(JCC) $(JO_)jerror.$(OBJ) $(C_) $(GLGEN)jerror.c | ||
| 179 | $(RM_) $(GLGEN)jerror.c | ||
| 180 | |||
| 181 | $(JOBJ)jaricom.$(OBJ) : $(JSRC)jaricom.c $(JDEP) | ||
| 182 | - $(CP_) $(JSRC)jaricom.c $(GLGEN)jaricom.c | ||
| 183 | + $(CP_) $(JSRC)jaricom.c $(GLGEN)jaricom.c || true | ||
| 184 | $(JCC) $(JO_)jaricom.$(OBJ) $(C_) $(GLGEN)jaricom.c | ||
| 185 | $(RM_) $(GLGEN)jaricom.c | ||
| 186 | |||
| 187 | # Encoding (compression) code. | ||
| 188 | |||
| 189 | $(JGEN)jpege.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpege_$(SHARE_JPEG).dev | ||
| 190 | - $(CP_) $(JGEN)jpege_$(SHARE_JPEG).dev $(JGEN)jpege.dev | ||
| 191 | + $(CP_) $(JGEN)jpege_$(SHARE_JPEG).dev $(JGEN)jpege.dev || true | ||
| 192 | |||
| 193 | $(JGEN)jpege_1.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(ECHOGS_XE) | ||
| 194 | $(SETMOD) $(JGEN)jpege_1 -lib $(JPEG_NAME) | ||
| 195 | |||
| 196 | $(JGEN)jpege_0.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpege6.dev | ||
| 197 | - $(CP_) $(JGEN)jpege6.dev $(JGEN)jpege_0.dev | ||
| 198 | + $(CP_) $(JGEN)jpege6.dev $(JGEN)jpege_0.dev || true | ||
| 199 | |||
| 200 | jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ) | ||
| 201 | |||
| 202 | @@ -230,90 +230,90 @@ $(JGEN)jpege6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpege6) $(jpege | ||
| 203 | $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3) | ||
| 204 | |||
| 205 | $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP) | ||
| 206 | - $(CP_) $(JSRC)jcapimin.c $(GLGEN)jcapimin.c | ||
| 207 | + $(CP_) $(JSRC)jcapimin.c $(GLGEN)jcapimin.c || true | ||
| 208 | $(JCC) $(JO_)jcapimin.$(OBJ) $(C_) $(GLGEN)jcapimin.c | ||
| 209 | $(RM_) $(GLGEN)jcapimin.c | ||
| 210 | |||
| 211 | $(JOBJ)jcapistd.$(OBJ) : $(JSRC)jcapistd.c $(JDEP) | ||
| 212 | - $(CP_) $(JSRC)jcapistd.c $(GLGEN)jcapistd.c | ||
| 213 | + $(CP_) $(JSRC)jcapistd.c $(GLGEN)jcapistd.c || true | ||
| 214 | $(JCC) $(JO_)jcapistd.$(OBJ) $(C_) $(GLGEN)jcapistd.c | ||
| 215 | $(RM_) $(GLGEN)jcapistd.c | ||
| 216 | |||
| 217 | $(JOBJ)jcinit.$(OBJ) : $(JSRC)jcinit.c $(JDEP) | ||
| 218 | - $(CP_) $(JSRC)jcinit.c $(GLGEN)jcinit.c | ||
| 219 | + $(CP_) $(JSRC)jcinit.c $(GLGEN)jcinit.c || true | ||
| 220 | $(JCC) $(JO_)jcinit.$(OBJ) $(C_) $(GLGEN)jcinit.c | ||
| 221 | $(RM_) $(GLGEN)jcinit.c | ||
| 222 | |||
| 223 | $(JOBJ)jccoefct.$(OBJ) : $(JSRC)jccoefct.c $(JDEP) | ||
| 224 | - $(CP_) $(JSRC)jccoefct.c $(GLGEN)jccoefct.c | ||
| 225 | + $(CP_) $(JSRC)jccoefct.c $(GLGEN)jccoefct.c || true | ||
| 226 | $(JCC) $(JO_)jccoefct.$(OBJ) $(C_) $(GLGEN)jccoefct.c | ||
| 227 | $(RM_) $(GLGEN)jccoefct.c | ||
| 228 | |||
| 229 | $(JOBJ)jccolor.$(OBJ) : $(JSRC)jccolor.c $(JDEP) | ||
| 230 | - $(CP_) $(JSRC)jccolor.c $(GLGEN)jccolor.c | ||
| 231 | + $(CP_) $(JSRC)jccolor.c $(GLGEN)jccolor.c || true | ||
| 232 | $(JCC) $(JO_)jccolor.$(OBJ) $(C_) $(GLGEN)jccolor.c | ||
| 233 | $(RM_) $(GLGEN)jccolor.c | ||
| 234 | |||
| 235 | $(JOBJ)jcdctmgr.$(OBJ) : $(JSRC)jcdctmgr.c $(JDEP) | ||
| 236 | - $(CP_) $(JSRC)jcdctmgr.c $(GLGEN)jcdctmgr.c | ||
| 237 | + $(CP_) $(JSRC)jcdctmgr.c $(GLGEN)jcdctmgr.c || true | ||
| 238 | $(JCC) $(JO_)jcdctmgr.$(OBJ) $(C_) $(GLGEN)jcdctmgr.c | ||
| 239 | $(RM_) $(GLGEN)jcdctmgr.c | ||
| 240 | |||
| 241 | $(JOBJ)jchuff.$(OBJ) : $(JSRC)jchuff.c $(JDEP) | ||
| 242 | - $(CP_) $(JSRC)jchuff.c $(GLGEN)jchuff.c | ||
| 243 | + $(CP_) $(JSRC)jchuff.c $(GLGEN)jchuff.c || true | ||
| 244 | $(JCC) $(JO_)jchuff.$(OBJ) $(C_) $(GLGEN)jchuff.c | ||
| 245 | $(RM_) $(GLGEN)jchuff.c | ||
| 246 | |||
| 247 | $(JOBJ)jcmainct.$(OBJ) : $(JSRC)jcmainct.c $(JDEP) | ||
| 248 | - $(CP_) $(JSRC)jcmainct.c $(GLGEN)jcmainct.c | ||
| 249 | + $(CP_) $(JSRC)jcmainct.c $(GLGEN)jcmainct.c || true | ||
| 250 | $(JCC) $(JO_)jcmainct.$(OBJ) $(C_) $(GLGEN)jcmainct.c | ||
| 251 | $(RM_) $(GLGEN)jcmainct.c | ||
| 252 | |||
| 253 | $(JOBJ)jcmarker.$(OBJ) : $(JSRC)jcmarker.c $(JDEP) | ||
| 254 | - $(CP_) $(JSRC)jcmarker.c $(GLGEN)jcmarker.c | ||
| 255 | + $(CP_) $(JSRC)jcmarker.c $(GLGEN)jcmarker.c || true | ||
| 256 | $(JCC) $(JO_)jcmarker.$(OBJ) $(C_) $(GLGEN)jcmarker.c | ||
| 257 | $(RM_) $(GLGEN)jcmarker.c | ||
| 258 | |||
| 259 | $(JOBJ)jcmaster.$(OBJ) : $(JSRC)jcmaster.c $(JDEP) | ||
| 260 | - $(CP_) $(JSRC)jcmaster.c $(GLGEN)jcmaster.c | ||
| 261 | + $(CP_) $(JSRC)jcmaster.c $(GLGEN)jcmaster.c || true | ||
| 262 | $(JCC) $(JO_)jcmaster.$(OBJ) $(C_) $(GLGEN)jcmaster.c | ||
| 263 | $(RM_) $(GLGEN)jcmaster.c | ||
| 264 | |||
| 265 | $(JOBJ)jcparam.$(OBJ) : $(JSRC)jcparam.c $(JDEP) | ||
| 266 | - $(CP_) $(JSRC)jcparam.c $(GLGEN)jcparam.c | ||
| 267 | + $(CP_) $(JSRC)jcparam.c $(GLGEN)jcparam.c || true | ||
| 268 | $(JCC) $(JO_)jcparam.$(OBJ) $(C_) $(GLGEN)jcparam.c | ||
| 269 | $(RM_) $(GLGEN)jcparam.c | ||
| 270 | |||
| 271 | $(JOBJ)jcprepct.$(OBJ) : $(JSRC)jcprepct.c $(JDEP) | ||
| 272 | - $(CP_) $(JSRC)jcprepct.c $(GLGEN)jcprepct.c | ||
| 273 | + $(CP_) $(JSRC)jcprepct.c $(GLGEN)jcprepct.c || true | ||
| 274 | $(JCC) $(JO_)jcprepct.$(OBJ) $(C_) $(GLGEN)jcprepct.c | ||
| 275 | $(RM_) $(GLGEN)jcprepct.c | ||
| 276 | |||
| 277 | $(JOBJ)jcsample.$(OBJ) : $(JSRC)jcsample.c $(JDEP) | ||
| 278 | - $(CP_) $(JSRC)jcsample.c $(GLGEN)jcsample.c | ||
| 279 | + $(CP_) $(JSRC)jcsample.c $(GLGEN)jcsample.c || true | ||
| 280 | $(JCC) $(JO_)jcsample.$(OBJ) $(C_) $(GLGEN)jcsample.c | ||
| 281 | $(RM_) $(GLGEN)jcsample.c | ||
| 282 | |||
| 283 | $(JOBJ)jfdctint.$(OBJ) : $(JSRC)jfdctint.c $(JDEP) | ||
| 284 | - $(CP_) $(JSRC)jfdctint.c $(GLGEN)jfdctint.c | ||
| 285 | + $(CP_) $(JSRC)jfdctint.c $(GLGEN)jfdctint.c || true | ||
| 286 | $(JCC) $(JO_)jfdctint.$(OBJ) $(C_) $(GLGEN)jfdctint.c | ||
| 287 | $(RM_) $(GLGEN)jfdctint.c | ||
| 288 | |||
| 289 | $(JOBJ)jcarith.$(OBJ) : $(JSRC)jcarith.c $(JDEP) | ||
| 290 | - $(CP_) $(JSRC)jcarith.c $(GLGEN)jcarith.c | ||
| 291 | + $(CP_) $(JSRC)jcarith.c $(GLGEN)jcarith.c || true | ||
| 292 | $(JCC) $(JO_)jcarith.$(OBJ) $(C_) $(GLGEN)jcarith.c | ||
| 293 | $(RM_) $(GLGEN)jcarith.c | ||
| 294 | |||
| 295 | # Decompression code | ||
| 296 | |||
| 297 | $(JGEN)jpegd.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpegd_$(SHARE_JPEG).dev | ||
| 298 | - $(CP_) $(JGEN)jpegd_$(SHARE_JPEG).dev $(JGEN)jpegd.dev | ||
| 299 | + $(CP_) $(JGEN)jpegd_$(SHARE_JPEG).dev $(JGEN)jpegd.dev || true | ||
| 300 | |||
| 301 | $(JGEN)jpegd_1.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(ECHOGS_XE) | ||
| 302 | $(SETMOD) $(JGEN)jpegd_1 -lib $(JPEG_NAME) | ||
| 303 | |||
| 304 | $(JGEN)jpegd_0.dev : $(TOP_MAKEFILES) $(JPEG_MAK) $(JGEN)jpegd6.dev | ||
| 305 | - $(CP_) $(JGEN)jpegd6.dev $(JGEN)jpegd_0.dev | ||
| 306 | + $(CP_) $(JGEN)jpegd6.dev $(JGEN)jpegd_0.dev || true | ||
| 307 | |||
| 308 | jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ) | ||
| 309 | |||
| 310 | @@ -329,76 +329,76 @@ $(JGEN)jpegd6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpegd6) $(jpegd | ||
| 311 | $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3) | ||
| 312 | |||
| 313 | $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP) | ||
| 314 | - $(CP_) $(JSRC)jdapimin.c $(GLGEN)jdapimin.c | ||
| 315 | + $(CP_) $(JSRC)jdapimin.c $(GLGEN)jdapimin.c || true | ||
| 316 | $(JCC) $(JO_)jdapimin.$(OBJ) $(C_) $(GLGEN)jdapimin.c | ||
| 317 | $(RM_) $(GLGEN)jdapimin.c | ||
| 318 | |||
| 319 | $(JOBJ)jdapistd.$(OBJ) : $(JSRC)jdapistd.c $(JDEP) | ||
| 320 | - $(CP_) $(JSRC)jdapistd.c $(GLGEN)jdapistd.c | ||
| 321 | + $(CP_) $(JSRC)jdapistd.c $(GLGEN)jdapistd.c || true | ||
| 322 | $(JCC) $(JO_)jdapistd.$(OBJ) $(C_) $(GLGEN)jdapistd.c | ||
| 323 | $(RM_) $(GLGEN)jdapistd.c | ||
| 324 | |||
| 325 | $(JOBJ)jdcoefct.$(OBJ) : $(JSRC)jdcoefct.c $(JDEP) | ||
| 326 | - $(CP_) $(JSRC)jdcoefct.c $(GLGEN)jdcoefct.c | ||
| 327 | + $(CP_) $(JSRC)jdcoefct.c $(GLGEN)jdcoefct.c || true | ||
| 328 | $(JCC) $(JO_)jdcoefct.$(OBJ) $(C_) $(GLGEN)jdcoefct.c | ||
| 329 | $(RM_) $(GLGEN)jdcoefct.c | ||
| 330 | |||
| 331 | $(JOBJ)jdcolor.$(OBJ) : $(JSRC)jdcolor.c $(JDEP) | ||
| 332 | - $(CP_) $(JSRC)jdcolor.c $(GLGEN)jdcolor.c | ||
| 333 | + $(CP_) $(JSRC)jdcolor.c $(GLGEN)jdcolor.c || true | ||
| 334 | $(JCC) $(JO_)jdcolor.$(OBJ) $(C_) $(GLGEN)jdcolor.c | ||
| 335 | $(RM_) $(GLGEN)jdcolor.c | ||
| 336 | |||
| 337 | $(JOBJ)jddctmgr.$(OBJ) : $(JSRC)jddctmgr.c $(JDEP) | ||
| 338 | - $(CP_) $(JSRC)jddctmgr.c $(GLGEN)jddctmgr.c | ||
| 339 | + $(CP_) $(JSRC)jddctmgr.c $(GLGEN)jddctmgr.c || true | ||
| 340 | $(JCC) $(JO_)jddctmgr.$(OBJ) $(C_) $(GLGEN)jddctmgr.c | ||
| 341 | $(RM_) $(GLGEN)jddctmgr.c | ||
| 342 | |||
| 343 | $(JOBJ)jdhuff.$(OBJ) : $(JSRC)jdhuff.c $(JDEP) | ||
| 344 | - $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c | ||
| 345 | + $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c || true | ||
| 346 | $(JCC) $(JO_)jdhuff.$(OBJ) $(C_) $(GLGEN)jdhuff.c | ||
| 347 | $(RM_) $(GLGEN)jdhuff.c | ||
| 348 | |||
| 349 | $(JOBJ)jdinput.$(OBJ) : $(JSRC)jdinput.c $(JDEP) | ||
| 350 | - $(CP_) $(JSRC)jdinput.c $(GLGEN)jdinput.c | ||
| 351 | + $(CP_) $(JSRC)jdinput.c $(GLGEN)jdinput.c || true | ||
| 352 | $(JCC) $(JO_)jdinput.$(OBJ) $(C_) $(GLGEN)jdinput.c | ||
| 353 | $(RM_) $(GLGEN)jdinput.c | ||
| 354 | |||
| 355 | $(JOBJ)jdmainct.$(OBJ) : $(JSRC)jdmainct.c $(JDEP) | ||
| 356 | - $(CP_) $(JSRC)jdmainct.c $(GLGEN)jdmainct.c | ||
| 357 | + $(CP_) $(JSRC)jdmainct.c $(GLGEN)jdmainct.c || true | ||
| 358 | $(JCC) $(JO_)jdmainct.$(OBJ) $(C_) $(GLGEN)jdmainct.c | ||
| 359 | $(RM_) $(GLGEN)jdmainct.c | ||
| 360 | |||
| 361 | $(JOBJ)jdmarker.$(OBJ) : $(JSRC)jdmarker.c $(JDEP) | ||
| 362 | - $(CP_) $(JSRC)jdmarker.c $(GLGEN)jdmarker.c | ||
| 363 | + $(CP_) $(JSRC)jdmarker.c $(GLGEN)jdmarker.c || true | ||
| 364 | $(JCC) $(JO_)jdmarker.$(OBJ) $(C_) $(GLGEN)jdmarker.c | ||
| 365 | $(RM_) $(GLGEN)jdmarker.c | ||
| 366 | |||
| 367 | $(JOBJ)jdmaster.$(OBJ) : $(JSRC)jdmaster.c $(JDEP) | ||
| 368 | - $(CP_) $(JSRC)jdmaster.c $(GLGEN)jdmaster.c | ||
| 369 | + $(CP_) $(JSRC)jdmaster.c $(GLGEN)jdmaster.c || true | ||
| 370 | $(JCC) $(JO_)jdmaster.$(OBJ) $(C_) $(GLGEN)jdmaster.c | ||
| 371 | $(RM_) $(GLGEN)jdmaster.c | ||
| 372 | |||
| 373 | #$(JOBJ)jdhuff.$(OBJ) : $(JSRC)jdhuff.c $(JDEP) | ||
| 374 | -# $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c | ||
| 375 | +# $(CP_) $(JSRC)jdhuff.c $(GLGEN)jdhuff.c || true | ||
| 376 | # $(JCC) $(JO_)jdhuff.$(OBJ) $(C_) $(GLGEN)jdhuff.c | ||
| 377 | # $(RM_) $(GLGEN)jdhuff.c | ||
| 378 | |||
| 379 | $(JOBJ)jdpostct.$(OBJ) : $(JSRC)jdpostct.c $(JDEP) | ||
| 380 | - $(CP_) $(JSRC)jdpostct.c $(GLGEN)jdpostct.c | ||
| 381 | + $(CP_) $(JSRC)jdpostct.c $(GLGEN)jdpostct.c || true | ||
| 382 | $(JCC) $(JO_)jdpostct.$(OBJ) $(C_) $(GLGEN)jdpostct.c | ||
| 383 | $(RM_) $(GLGEN)jdpostct.c | ||
| 384 | |||
| 385 | $(JOBJ)jdsample.$(OBJ) : $(JSRC)jdsample.c $(JDEP) | ||
| 386 | - $(CP_) $(JSRC)jdsample.c $(GLGEN)jdsample.c | ||
| 387 | + $(CP_) $(JSRC)jdsample.c $(GLGEN)jdsample.c || true | ||
| 388 | $(JCC) $(JO_)jdsample.$(OBJ) $(C_) $(GLGEN)jdsample.c | ||
| 389 | $(RM_) $(GLGEN)jdsample.c | ||
| 390 | |||
| 391 | $(JOBJ)jidctint.$(OBJ) : $(JSRC)jidctint.c $(JDEP) | ||
| 392 | - $(CP_) $(JSRC)jidctint.c $(GLGEN)jidctint.c | ||
| 393 | + $(CP_) $(JSRC)jidctint.c $(GLGEN)jidctint.c || true | ||
| 394 | $(JCC) $(JO_)jidctint.$(OBJ) $(C_) $(GLGEN)jidctint.c | ||
| 395 | $(RM_) $(GLGEN)jidctint.c | ||
| 396 | |||
| 397 | $(JOBJ)jdarith.$(OBJ) : $(JSRC)jdarith.c $(JDEP) | ||
| 398 | - $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c | ||
| 399 | + $(CP_) $(JSRC)jdarith.c $(GLGEN)jdarith.c || true | ||
| 400 | $(JCC) $(JO_)jdarith.$(OBJ) $(C_) $(GLGEN)jdarith.c | ||
| 401 | $(RM_) $(GLGEN)jdarith.c | ||
| 402 | diff --git a/base/jpegxr.mak b/base/jpegxr.mak | ||
| 403 | index 0f09a3a..36495dd 100644 | ||
| 404 | --- a/base/jpegxr.mak | ||
| 405 | +++ b/base/jpegxr.mak | ||
| 406 | @@ -103,7 +103,7 @@ $(JPEGXR_OBJ)x_strip.$(OBJ) : $(JPEGXR_SRC)x_strip.c $(jpegxr_hdrs) | ||
| 407 | # Copy the target definition we want | ||
| 408 | $(JPEGXR_GEN)jpegxr.dev : $(TOP_MAKEFILES) $(JPEGXR_MAK) \ | ||
| 409 | $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev | ||
| 410 | - $(CP_) $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev $(JPEGXR_GEN)jpegxr.dev | ||
| 411 | + $(CP_) $(JPEGXR_GEN)jpegxr_$(SHARE_JPEGXR).dev $(JPEGXR_GEN)jpegxr.dev || true | ||
| 412 | |||
| 413 | # Define the compiled in target | ||
| 414 | $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs) | ||
| 415 | diff --git a/base/lcms.mak b/base/lcms.mak | ||
| 416 | index 18cfa09..269e7ff 100644 | ||
| 417 | --- a/base/lcms.mak | ||
| 418 | +++ b/base/lcms.mak | ||
| 419 | @@ -84,7 +84,7 @@ LCMSO_=$(O_)$(LCMSOBJ) | ||
| 420 | |||
| 421 | # switch in the version of lcms.dev we're actually using | ||
| 422 | $(LCMSGEN)lcms.dev : $(TOP_MAKEFILES) $(LCMSGEN)lcms_$(SHARE_LCMS).dev | ||
| 423 | - $(CP_) $(LCMSGEN)lcms_$(SHARE_LCMS).dev $(LCMSGEN)lcms.dev | ||
| 424 | + $(CP_) $(LCMSGEN)lcms_$(SHARE_LCMS).dev $(LCMSGEN)lcms.dev || true | ||
| 425 | |||
| 426 | # dev file for shared (separately built) lcms library | ||
| 427 | $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE) | ||
| 428 | diff --git a/base/lcms2.mak b/base/lcms2.mak | ||
| 429 | index 52f750c..33a9c16 100644 | ||
| 430 | --- a/base/lcms2.mak | ||
| 431 | +++ b/base/lcms2.mak | ||
| 432 | @@ -85,7 +85,7 @@ LCMS2O_=$(O_)$(LCMS2OBJ) | ||
| 433 | |||
| 434 | # switch in the version of lcms2.dev we're actually using | ||
| 435 | $(LCMS2GEN)lcms2.dev : $(TOP_MAKEFILES) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev | ||
| 436 | - $(CP_) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2.dev | ||
| 437 | + $(CP_) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2.dev || true | ||
| 438 | |||
| 439 | # dev file for shared (separately built) lcms library | ||
| 440 | $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE) | ||
| 441 | diff --git a/base/lcups.mak b/base/lcups.mak | ||
| 442 | index 7504c44..7b9b979 100644 | ||
| 443 | --- a/base/lcups.mak | ||
| 444 | +++ b/base/lcups.mak | ||
| 445 | @@ -116,7 +116,7 @@ libcups.config-clean : | ||
| 446 | |||
| 447 | # instantiate the requested build option (shared or compiled in) | ||
| 448 | $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev | ||
| 449 | - $(CP_) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev $(LIBCUPSGEN)lcups.dev | ||
| 450 | + $(CP_) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev $(LIBCUPSGEN)lcups.dev || true | ||
| 451 | |||
| 452 | # Define the shared version. | ||
| 453 | $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) | ||
| 454 | @@ -133,7 +133,7 @@ $(LIBCUPSGEN)lcups_0.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) \ | ||
| 455 | # for simplicity we have every source file depend on all headers | ||
| 456 | |||
| 457 | $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h | ||
| 458 | - $(CP_) $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h $(LIBCUPSGEN)$(D)cups$(D)config.h | ||
| 459 | + $(CP_) $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h $(LIBCUPSGEN)$(D)cups$(D)config.h || true | ||
| 460 | |||
| 461 | $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h | ||
| 462 | $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c | ||
| 463 | @@ -220,7 +220,7 @@ $(LIBCUPSOBJ)mark.$(OBJ) : $(LIBCUPSSRC)mark.c $(LIBSCUPSHEADERS) | ||
| 464 | $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c | ||
| 465 | |||
| 466 | $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS) | ||
| 467 | - $(CP_) $(LIBCUPSSRC)md5.c $(LIBCUPSGEN)cups_md5.c | ||
| 468 | + $(CP_) $(LIBCUPSSRC)md5.c $(LIBCUPSGEN)cups_md5.c || true | ||
| 469 | $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c | ||
| 470 | |||
| 471 | $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS) | ||
| 472 | @@ -257,7 +257,7 @@ $(LIBCUPSOBJ)snmp.$(OBJ) : $(LIBCUPSSRC)snmp.c $(LIBSCUPSHEADERS) | ||
| 473 | $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c | ||
| 474 | |||
| 475 | $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS) | ||
| 476 | - $(CP_) $(LIBCUPSSRC)snprintf.c $(LIBCUPSGEN)cups_snpf.c | ||
| 477 | + $(CP_) $(LIBCUPSSRC)snprintf.c $(LIBCUPSGEN)cups_snpf.c || true | ||
| 478 | $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c | ||
| 479 | |||
| 480 | $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS) | ||
| 481 | @@ -279,5 +279,5 @@ $(LIBCUPSOBJ)thread.$(OBJ) : $(LIBCUPSSRC)thread.c $(LIBSCUPSHEADERS) | ||
| 482 | $(LCUPS_CC) $(LCUPSO_)thread.$(OBJ) $(C_) $(LIBCUPSSRC)thread.c | ||
| 483 | |||
| 484 | $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS) | ||
| 485 | - $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c | ||
| 486 | + $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true | ||
| 487 | $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c | ||
| 488 | diff --git a/base/lcupsi.mak b/base/lcupsi.mak | ||
| 489 | index da47da5..fa7d74c 100644 | ||
| 490 | --- a/base/lcupsi.mak | ||
| 491 | +++ b/base/lcupsi.mak | ||
| 492 | @@ -59,7 +59,7 @@ libcupsi.config-clean : | ||
| 493 | |||
| 494 | # instantiate the requested build option (shared or compiled in) | ||
| 495 | $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev | ||
| 496 | - $(CP_) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev $(LIBCUPSIGEN)lcupsi.dev | ||
| 497 | + $(CP_) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev $(LIBCUPSIGEN)lcupsi.dev || true | ||
| 498 | |||
| 499 | # Define the shared version. | ||
| 500 | $(LIBCUPSIGEN)lcupsi_1.dev : $(TOP_MAKEFILES) $(LCUPSI_MAK) $(ECHOGS_XE) | ||
| 501 | diff --git a/base/ldf_jb2.mak b/base/ldf_jb2.mak | ||
| 502 | index 3f50892..97c76a0 100644 | ||
| 503 | --- a/base/ldf_jb2.mak | ||
| 504 | +++ b/base/ldf_jb2.mak | ||
| 505 | @@ -223,7 +223,7 @@ ldf_jb2_HDRS=$(ldf_jb2_common_HDRS) $(ldf_jb2_compress_HDRS) | ||
| 506 | |||
| 507 | # switch in the selected library .dev | ||
| 508 | $(LDF_JB2_GEN)ldf_jb2.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev | ||
| 509 | - $(CP_) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev $(LDF_JB2_GEN)ldf_jb2.dev | ||
| 510 | + $(CP_) $(LDF_JB2_GEN)ldf_jb2_$(SHARE_JBIG2).dev $(LDF_JB2_GEN)ldf_jb2.dev || true | ||
| 511 | |||
| 512 | # external link .dev | ||
| 513 | $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) | ||
| 514 | diff --git a/base/lib.mak b/base/lib.mak | ||
| 515 | index 90c9249..fb11aba 100644 | ||
| 516 | --- a/base/lib.mak | ||
| 517 | +++ b/base/lib.mak | ||
| 518 | @@ -350,7 +350,7 @@ md5_=$(GLOBJ)md5.$(OBJ) | ||
| 519 | $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE) | ||
| 520 | $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22 | ||
| 521 | $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h | ||
| 522 | - $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c | ||
| 523 | + $(CP_) $(GLSRC)md5.c $(GLGEN)md5.c || true | ||
| 524 | $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c | ||
| 525 | $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h | ||
| 526 | |||
| 527 | @@ -631,19 +631,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\ | ||
| 528 | $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\ | ||
| 529 | $(MAKEDDIRS) | ||
| 530 | $(RM_) $(GLGEN)gconfig.c | ||
| 531 | - $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c | ||
| 532 | + $(CP_) $(GLSRC)gconf.c $(GLGEN)gconfig.c || true | ||
| 533 | $(GLCC) $(GLO_)gconfig.$(OBJ) $(C_) $(GLGEN)gconfig.c | ||
| 534 | |||
| 535 | $(GLOBJ)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\ | ||
| 536 | $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS) | ||
| 537 | $(RM_) $(GLGEN)gscdefs.c | ||
| 538 | - $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c | ||
| 539 | + $(CP_) $(GLSRC)gscdef.c $(GLGEN)gscdefs.c || true | ||
| 540 | $(GLCC) $(GLO_)gscdefs.$(OBJ) $(C_) $(GLGEN)gscdefs.c | ||
| 541 | |||
| 542 | $(AUX)gscdefs.$(OBJ) : $(GLSRC)gscdef.c\ | ||
| 543 | $(std_h) $(gscdefs_h) $(gconfigd_h) $(TOP_MAKEFILES) $(MAKEDIRS) | ||
| 544 | $(RM_) $(AUX)gscdefs.c | ||
| 545 | - $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c | ||
| 546 | + $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c || true | ||
| 547 | $(GLCCAUX) $(C_) $(AUXO_)gscdefs.$(OBJ) $(AUX)gscdefs.c | ||
| 548 | |||
| 549 | $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\ | ||
| 550 | @@ -1535,7 +1535,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\ | ||
| 551 | $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c | ||
| 552 | |||
| 553 | $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) | ||
| 554 | - $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ) | ||
| 555 | + $(CP_) $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegc.$(OBJ) || true | ||
| 556 | |||
| 557 | # sdcparam is used by the filter operator and the PS/PDF writer. | ||
| 558 | # It is not included automatically in sdcte/d. | ||
| 559 | @@ -1563,7 +1563,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\ | ||
| 560 | $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c | ||
| 561 | |||
| 562 | $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) | ||
| 563 | - $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ) | ||
| 564 | + $(CP_) $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdcte.$(OBJ) || true | ||
| 565 | |||
| 566 | |||
| 567 | $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ | ||
| 568 | @@ -1579,7 +1579,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ | ||
| 569 | $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c | ||
| 570 | |||
| 571 | $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) | ||
| 572 | - $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ) | ||
| 573 | + $(CP_) $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpege.$(OBJ) || true | ||
| 574 | |||
| 575 | # sdeparam is used by the filter operator and the PS/PDF writer. | ||
| 576 | # It is not included automatically in sdcte. | ||
| 577 | @@ -1611,7 +1611,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\ | ||
| 578 | $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c | ||
| 579 | |||
| 580 | $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) | ||
| 581 | - $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ) | ||
| 582 | + $(CP_) $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sdctd.$(OBJ) || true | ||
| 583 | |||
| 584 | |||
| 585 | $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ | ||
| 586 | @@ -1628,7 +1628,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ | ||
| 587 | |||
| 588 | |||
| 589 | $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) | ||
| 590 | - $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ) | ||
| 591 | + $(CP_) $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(GLOBJ)sjpegd.$(OBJ) || true | ||
| 592 | |||
| 593 | # sddparam is used by the filter operator. | ||
| 594 | # It is not included automatically in sdctd. | ||
| 595 | @@ -1651,7 +1651,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_) | ||
| 596 | |||
| 597 | # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory. | ||
| 598 | $(GLD)slzwe.dev : $(GLD)lzwe.dev | ||
| 599 | - $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev | ||
| 600 | + $(CP_) $(GLD)lzwe.dev $(GLD)slzwe.dev || true | ||
| 601 | |||
| 602 | $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\ | ||
| 603 | $(slzwx_h) $(strimpl_h) $(MAKEDIRS) | ||
| 604 | @@ -1667,7 +1667,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_) | ||
| 605 | |||
| 606 | # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory. | ||
| 607 | $(GLD)slzwd.dev : $(GLD)lzwd.dev | ||
| 608 | - $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev | ||
| 609 | + $(CP_) $(GLD)lzwd.dev $(GLD)slzwd.dev || true | ||
| 610 | |||
| 611 | $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\ | ||
| 612 | $(slzwx_h) $(strimpl_h) $(MAKEDIRS) | ||
| 613 | @@ -1717,7 +1717,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\ | ||
| 614 | # ---------------- JBIG2 compression filter ---------------- # | ||
| 615 | |||
| 616 | $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev | ||
| 617 | - $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev | ||
| 618 | + $(CP_) $(GLD)sjbig2_$(JBIG2_LIB).dev $(GLD)sjbig2.dev || true | ||
| 619 | |||
| 620 | # jbig2dec version | ||
| 621 | sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ) | ||
| 622 | @@ -1753,7 +1753,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \ | ||
| 623 | # ---------------- JPEG 2000 compression filter ---------------- # | ||
| 624 | |||
| 625 | $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev | ||
| 626 | - $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev | ||
| 627 | + $(CP_) $(GLD)sjpx_$(JPX_LIB).dev $(GLD)sjpx.dev || true | ||
| 628 | |||
| 629 | $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \ | ||
| 630 | $(memory__h) $(gsmalloc_h) \ | ||
| 631 | @@ -1882,7 +1882,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\ | ||
| 632 | $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c | ||
| 633 | |||
| 634 | $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) | ||
| 635 | - $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ) | ||
| 636 | + $(CP_) $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibc.$(OBJ) || true | ||
| 637 | |||
| 638 | szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ) | ||
| 639 | $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_) | ||
| 640 | @@ -1898,7 +1898,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\ | ||
| 641 | $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c | ||
| 642 | |||
| 643 | $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) | ||
| 644 | - $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ) | ||
| 645 | + $(CP_) $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibe.$(OBJ) || true | ||
| 646 | |||
| 647 | szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ) | ||
| 648 | $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_) | ||
| 649 | @@ -1914,7 +1914,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\ | ||
| 650 | $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c | ||
| 651 | |||
| 652 | $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) | ||
| 653 | - $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ) | ||
| 654 | + $(CP_) $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)szlibd.$(OBJ) || true | ||
| 655 | |||
| 656 | # ---------------- Page devices ---------------- # | ||
| 657 | # We include this here, rather than in devs.mak, because it is more like | ||
| 658 | @@ -2804,7 +2804,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\ | ||
| 659 | $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c | ||
| 660 | |||
| 661 | $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(gp_h) | ||
| 662 | - $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) | ||
| 663 | + $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) || true | ||
| 664 | |||
| 665 | |||
| 666 | $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ | ||
| 667 | @@ -2817,7 +2817,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ | ||
| 668 | |||
| 669 | $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(gp_h) \ | ||
| 670 | $(gxsync_h) | ||
| 671 | - $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) | ||
| 672 | + $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true | ||
| 673 | |||
| 674 | # Note that gsicc_create requires compile with lcms to obtain icc34.h | ||
| 675 | # header file that is used for creating ICC structures from PS objects. | ||
| 676 | @@ -2837,7 +2837,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\ | ||
| 677 | $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c | ||
| 678 | |||
| 679 | $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS) | ||
| 680 | - $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ) | ||
| 681 | + $(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ) || true | ||
| 682 | |||
| 683 | |||
| 684 | #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */ | ||
| 685 | @@ -3141,7 +3141,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS) | ||
| 686 | $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS) | ||
| 687 | |||
| 688 | $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS) | ||
| 689 | - $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c | ||
| 690 | + $(CP_) $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(GLGEN)gsromfs1.c || true | ||
| 691 | |||
| 692 | # the following module is only included if the romfs.dev FEATURE is enabled | ||
| 693 | $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ | ||
| 694 | @@ -3157,7 +3157,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ | ||
| 695 | $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c | ||
| 696 | |||
| 697 | $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) | ||
| 698 | - $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ) | ||
| 699 | + $(CP_) $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(GLOBJ)gsiorom.$(OBJ) || true | ||
| 700 | |||
| 701 | $(GLOBJ)gsromfs1.$(OBJ) : $(GLOBJ)gsromfs1.c $(time__h) $(MAKEDIRS) | ||
| 702 | $(GLCC) $(GLO_)gsromfs1.$(OBJ) $(C_) $(GLOBJ)gsromfs1.c | ||
| 703 | diff --git a/base/lwf_jp2.mak b/base/lwf_jp2.mak | ||
| 704 | index ca1b7cc..ad6446d 100644 | ||
| 705 | --- a/base/lwf_jp2.mak | ||
| 706 | +++ b/base/lwf_jp2.mak | ||
| 707 | @@ -176,7 +176,7 @@ lwf_jp2_HDRS = \ | ||
| 708 | |||
| 709 | # switch in the selected library .dev | ||
| 710 | $(LWF_JP2_GEN)lwf_jp2.dev : $(TOP_MAKEFILES) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev | ||
| 711 | - $(CP_) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev $(LWF_JP2_GEN)lwf_jp2.dev | ||
| 712 | + $(CP_) $(LWF_JP2_GEN)lwf_jp2_$(SHARE_JPX).dev $(LWF_JP2_GEN)lwf_jp2.dev || true | ||
| 713 | |||
| 714 | # external link .dev | ||
| 715 | $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) | ||
| 716 | diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak | ||
| 717 | index 38a2937..2ab7cae 100644 | ||
| 718 | --- a/base/macos-mcp.mak | ||
| 719 | +++ b/base/macos-mcp.mak | ||
| 720 | @@ -383,11 +383,11 @@ CWPROJ_XML=./ghostscript.mcp.xml | ||
| 721 | |||
| 722 | $(CWPROJ_XML): $(gconfigd_h) | ||
| 723 | -mkdir -p obj/sys | ||
| 724 | - $(CP_) $(macsystypes_h) $(systypes_h) | ||
| 725 | + $(CP_) $(macsystypes_h) $(systypes_h) || true | ||
| 726 | $(SH) $(GLSRC)macgenmcpxml.sh `$(CAT) $(ld_tr)` > $(CWPROJ_XML) | ||
| 727 | - $(CP_) $(GLSRC)gconf.c $(GLOBJ)gconfig.c | ||
| 728 | - $(CP_) $(GLSRC)iconf.c $(GLOBJ)iconfig.c | ||
| 729 | - $(CP_) $(GLSRC)gscdef.c $(GLOBJ)gscdefs.c | ||
| 730 | + $(CP_) $(GLSRC)gconf.c $(GLOBJ)gconfig.c || true | ||
| 731 | + $(CP_) $(GLSRC)iconf.c $(GLOBJ)iconfig.c || true | ||
| 732 | + $(CP_) $(GLSRC)gscdef.c $(GLOBJ)gscdefs.c || true | ||
| 733 | /Developer/Tools/SetFile -c CWIE -t TEXT $(CWPROJ_XML) | ||
| 734 | |||
| 735 | $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) | ||
| 736 | diff --git a/base/openjpeg.mak b/base/openjpeg.mak | ||
| 737 | index b194709..dac7901 100644 | ||
| 738 | --- a/base/openjpeg.mak | ||
| 739 | +++ b/base/openjpeg.mak | ||
| 740 | @@ -99,7 +99,7 @@ open_jpeg_HDRS = \ | ||
| 741 | |||
| 742 | # switch in the selected library .dev | ||
| 743 | $(OPEN_JPEG_GEN)openjpeg.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev | ||
| 744 | - $(CP_) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev $(OPEN_JPEG_GEN)openjpeg.dev | ||
| 745 | + $(CP_) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev $(OPEN_JPEG_GEN)openjpeg.dev || true | ||
| 746 | |||
| 747 | # external link .dev | ||
| 748 | $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) | ||
| 749 | diff --git a/base/openvms.mak b/base/openvms.mak | ||
| 750 | index 1ea06fe..84378a4 100644 | ||
| 751 | --- a/base/openvms.mak | ||
| 752 | +++ b/base/openvms.mak | ||
| 753 | @@ -365,7 +365,7 @@ SH= | ||
| 754 | |||
| 755 | # Define generic commands. | ||
| 756 | |||
| 757 | -CP_=$$ @$(GLSRCDIR)COPY_ONE | ||
| 758 | +CP_=$$ @$(GLSRCDIR)COPY_ONE || true | ||
| 759 | |||
| 760 | # Define the command for deleting (a) file(s) (including wild cards) | ||
| 761 | |||
| 762 | diff --git a/base/png.mak b/base/png.mak | ||
| 763 | index 1725ddb..0d54b80 100644 | ||
| 764 | --- a/base/png.mak | ||
| 765 | +++ b/base/png.mak | ||
| 766 | @@ -79,7 +79,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 | @@ -134,7 +134,7 @@ $(PNGOBJ)pngget.$(OBJ) : $(PNGSRC)pngget.c $(PDEP) | ||
| 776 | |||
| 777 | # Define the version of libpng.dev that we are actually using. | ||
| 778 | $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(MAKEDIRS) | ||
| 779 | - $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev | ||
| 780 | + $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev || true | ||
| 781 | |||
| 782 | # Define the shared version of libpng. | ||
| 783 | # Note that it requires libz, which must be searched *after* libpng. | ||
| 784 | diff --git a/base/tiff.mak b/base/tiff.mak | ||
| 785 | index 0ea9f9e..80d8926 100644 | ||
| 786 | --- a/base/tiff.mak | ||
| 787 | +++ b/base/tiff.mak | ||
| 788 | @@ -53,11 +53,11 @@ tiff_11=$(TIFFOBJ)gstiffio.$(OBJ) | ||
| 789 | |||
| 790 | $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in | ||
| 791 | cd $(TIFFSRC) && ./configure | ||
| 792 | - $(CP_) $(TIFFCONF)libtiff$(D)tif_config.h $(TIFFCONF)libtiff$(D)tif_config.unix.h | ||
| 793 | + $(CP_) $(TIFFCONF)libtiff$(D)tif_config.h $(TIFFCONF)libtiff$(D)tif_config.unix.h || true | ||
| 794 | |||
| 795 | $(TIFFSRC)libtiff$(D)tiffconf.unix.h : $(TIFFSRC)libtiff$(D)tiffconf.h.in | ||
| 796 | cd $(TIFFSRC) && ./configure | ||
| 797 | - $(CP_) $(TIFFCONF)libtiff$(D)tiffconf.h $(TIFFCONF)libtiff$(D)tiffconf.unix.h | ||
| 798 | + $(CP_) $(TIFFCONF)libtiff$(D)tiffconf.h $(TIFFCONF)libtiff$(D)tiffconf.unix.h || true | ||
| 799 | |||
| 800 | $(TIFFOBJ)tif_aux.$(OBJ) : $(TIFFSRC)/libtiff/tif_aux.c $(TIFFDEP) | ||
| 801 | $(TIFFCC) $(TIFFO_)tif_aux.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_aux.c | ||
| 802 | @@ -189,14 +189,14 @@ $(TIFFOBJ)gstiffio.$(OBJ) : $(GLSRC)gstiffio.c $(gstiffio_h) $(PDEVH) $(stdint__ | ||
| 803 | $(TIFFCC) $(TIFFO_)gstiffio.$(OBJ) $(D_)SHARE_LIBTIFF=$(SHARE_LIBTIFF) $(C_) $(GLSRC)gstiffio.c | ||
| 804 | |||
| 805 | $(TIFFGEN)tif_config.h: $(TIFFCONFIG_H) | ||
| 806 | - $(CP_) $(TIFFCONFIG_H) $(TIFFGEN)tif_config.h | ||
| 807 | + $(CP_) $(TIFFCONFIG_H) $(TIFFGEN)tif_config.h || true | ||
| 808 | |||
| 809 | $(TIFFGEN)tiffconf.h: $(TIFFCONF_H) | ||
| 810 | - $(CP_) $(TIFFCONF_H) $(TIFFGEN)tiffconf.h | ||
| 811 | + $(CP_) $(TIFFCONF_H) $(TIFFGEN)tiffconf.h || true | ||
| 812 | |||
| 813 | # Define the version of libtiff.dev that we are actually using. | ||
| 814 | $(TIFFGEN)libtiff.dev : $(TOP_MAKEFILES) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev | ||
| 815 | - $(CP_) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev $(TIFFGEN)libtiff.dev | ||
| 816 | + $(CP_) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev $(TIFFGEN)libtiff.dev || true | ||
| 817 | |||
| 818 | |||
| 819 | # Define the shared version. | ||
| 820 | diff --git a/base/unix-aux.mak b/base/unix-aux.mak | ||
| 821 | index 1ddad78..6b24422 100644 | ||
| 822 | --- a/base/unix-aux.mak | ||
| 823 | +++ b/base/unix-aux.mak | ||
| 824 | @@ -105,7 +105,7 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\ | ||
| 825 | # $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) | ||
| 826 | # | ||
| 827 | #$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) | ||
| 828 | -# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) | ||
| 829 | +# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) || true | ||
| 830 | |||
| 831 | # Query the environment to construct gconfig_.h. | ||
| 832 | # These are all defined conditionally (except the JasPER one), so that | ||
| 833 | diff --git a/base/unixhead.mak b/base/unixhead.mak | ||
| 834 | index 6aa3599..70a61f8 100644 | ||
| 835 | --- a/base/unixhead.mak | ||
| 836 | +++ b/base/unixhead.mak | ||
| 837 | @@ -53,7 +53,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 | |||
| 846 | diff --git a/base/zlib.mak b/base/zlib.mak | ||
| 847 | index 78d398a..3d48145 100644 | ||
| 848 | --- a/base/zlib.mak | ||
| 849 | +++ b/base/zlib.mak | ||
| 850 | @@ -83,7 +83,7 @@ $(ZOBJ)zutil.$(OBJ) : $(ZSRC)zutil.c $(ZDEP) | ||
| 851 | # Encoding (compression) code. | ||
| 852 | |||
| 853 | $(ZGEN)zlibe.dev : $(TOP_MAKEFILES) $(ZGEN)zlibe_$(SHARE_ZLIB).dev | ||
| 854 | - $(CP_) $(ZGEN)zlibe_$(SHARE_ZLIB).dev $(ZGEN)zlibe.dev | ||
| 855 | + $(CP_) $(ZGEN)zlibe_$(SHARE_ZLIB).dev $(ZGEN)zlibe.dev || true | ||
| 856 | |||
| 857 | $(ZGEN)zlibe_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) | ||
| 858 | $(SETMOD) $(ZGEN)zlibe_1 -lib $(ZLIB_NAME) | ||
| 859 | @@ -111,7 +111,7 @@ $(ZOBJ)trees.$(OBJ) : $(ZSRC)trees.c $(ZDEP) | ||
| 860 | # with 0.90 do. | ||
| 861 | |||
| 862 | $(ZGEN)crc32.dev : $(TOP_MAKEFILES) $(ZGEN)crc32_$(SHARE_ZLIB).dev | ||
| 863 | - $(CP_) $(ZGEN)crc32_$(SHARE_ZLIB).dev $(ZGEN)crc32.dev | ||
| 864 | + $(CP_) $(ZGEN)crc32_$(SHARE_ZLIB).dev $(ZGEN)crc32.dev || true | ||
| 865 | |||
| 866 | $(ZGEN)crc32_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) | ||
| 867 | $(SETMOD) $(ZGEN)crc32_1 -lib $(ZLIB_NAME) | ||
| 868 | @@ -127,7 +127,7 @@ $(ZOBJ)crc32.$(OBJ) : $(ZSRC)crc32.c $(ZDEP) | ||
| 869 | # Decoding (decompression) code. | ||
| 870 | |||
| 871 | $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(MAKEDIRS) | ||
| 872 | - $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev | ||
| 873 | + $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev || true | ||
| 874 | |||
| 875 | $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) | ||
| 876 | $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) | ||
| 877 | diff --git a/devices/devs.mak b/devices/devs.mak | ||
| 878 | index 0a668d4..a19082e 100644 | ||
| 879 | --- a/devices/devs.mak | ||
| 880 | +++ b/devices/devs.mak | ||
| 881 | @@ -1547,7 +1547,7 @@ libpng_dev=$(PNGGENDIR)$(D)libpng.dev | ||
| 882 | png_i_=-include $(PNGGENDIR)$(D)libpng | ||
| 883 | |||
| 884 | $(DEVOBJ)gdevpng.$(OBJ) : $(DEVSRC)gdevpng.c\ | ||
| 885 | - $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h) | ||
| 886 | + $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h) $(PDEP) | ||
| 887 | $(CC_) $(I_)$(DEVI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(DEVO_)gdevpng.$(OBJ) $(C_) $(DEVSRC)gdevpng.c | ||
| 888 | |||
| 889 | $(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) | ||
| 890 | diff --git a/psi/int.mak b/psi/int.mak | ||
| 891 | index 7d36e66..71b88f5 100644 | ||
| 892 | --- a/psi/int.mak | ||
| 893 | +++ b/psi/int.mak | ||
| 894 | @@ -274,7 +274,7 @@ $(PSOBJ)iconfig.$(OBJ) : $(gconfig_h) $(PSSRC)iconf.c $(stdio__h)\ | ||
| 895 | $(gconf_h) $(gconfigd_h) $(gsmemory_h) $(gstypes_h)\ | ||
| 896 | $(iminst_h) $(iref_h) $(ivmspace_h) $(opdef_h) $(iplugin_h) | ||
| 897 | $(RM_) $(PSGEN)iconfig.c | ||
| 898 | - $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c | ||
| 899 | + $(CP_) $(PSSRC)iconf.c $(PSGEN)iconfig.c || true | ||
| 900 | $(PSCC) $(PSO_)iconfig.$(OBJ) $(C_) $(PSGEN)iconfig.c | ||
| 901 | |||
| 902 | $(PSOBJ)iinit.$(OBJ) : $(PSSRC)iinit.c $(GH) $(string__h)\ | ||
| 903 | @@ -607,7 +607,7 @@ $(PSD)psbase.dev : $(INT_MAK) $(ECHOGS_XE) $(INT_OBJS)\ | ||
| 904 | |||
| 905 | # We keep the old name for backward compatibility. | ||
| 906 | $(PSD)level1.dev : $(PSD)psl1.dev | ||
| 907 | - $(CP_) $(PSD)psl1.dev $(PSD)level1.dev | ||
| 908 | + $(CP_) $(PSD)psl1.dev $(PSD)level1.dev || true | ||
| 909 | |||
| 910 | $(PSD)psl1.dev : $(INT_MAK) $(ECHOGS_XE)\ | ||
| 911 | $(PSD)psbase.dev $(PSD)bcp.dev $(PSD)path1.dev $(PSD)type1.dev | ||
| 912 | @@ -934,7 +934,7 @@ $(PSOBJ)zfrsd.$(OBJ) : $(PSSRC)zfrsd.c $(OP) $(memory__h)\ | ||
| 913 | |||
| 914 | # We keep the old name for backward compatibility. | ||
| 915 | $(PSD)level2.dev : $(PSD)psl2.dev | ||
| 916 | - $(CP_) $(PSD)psl2.dev $(PSD)level2.dev | ||
| 917 | + $(CP_) $(PSD)psl2.dev $(PSD)level2.dev || true | ||
| 918 | |||
| 919 | # We -include dpsand2 first so that geninit will have access to the | ||
| 920 | # system name table as soon as possible. | ||
| 921 | @@ -1193,7 +1193,7 @@ $(PSOBJ)zfjbig2_luratech.$(OBJ) : $(PSSRC)zfjbig2.c $(OP) $(memory__h)\ | ||
| 922 | # this can be turned on and off with a FEATURE_DEV | ||
| 923 | |||
| 924 | $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev | ||
| 925 | - $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev | ||
| 926 | + $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev || true | ||
| 927 | |||
| 928 | fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ) | ||
| 929 | |||
| 930 | -- | ||
| 931 | 1.9.1 | ||
| 932 | |||
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 db8740affa..bc29be5070 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 | |||
| @@ -8,13 +8,15 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com> | |||
| 8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 9 | 9 | ||
| 10 | diff --git a/base/unix-aux.mak b/base/unix-aux.mak | 10 | diff --git a/base/unix-aux.mak b/base/unix-aux.mak |
| 11 | index c032b3f..1ddad78 100644 | 11 | index a91fb26..c991d11 100644 |
| 12 | --- a/base/unix-aux.mak | 12 | --- a/base/unix-aux.mak |
| 13 | +++ b/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)\ | 14 | @@ -69,46 +69,46 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\ |
| 15 | 15 | $(MAKEDIRS) | |
| 16 | # -------------------------- Auxiliary programs --------------------------- # | 16 | $(GLCC) $(GLO_)gp_sysv.$(OBJ) $(C_) $(GLSRC)gp_sysv.c |
| 17 | 17 | ||
| 18 | -# -------------------------- Auxiliary programs --------------------------- # | ||
| 19 | - | ||
| 18 | -$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) | 20 | -$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) |
| 19 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) | 21 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) |
| 20 | - | 22 | - |
| @@ -39,7 +41,7 @@ index c032b3f..1ddad78 100644 | |||
| 39 | - $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | 41 | - $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 40 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) | 42 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) |
| 41 | - | 43 | - |
| 42 | -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) | 44 | -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(MAKEDIRS) |
| 43 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) | 45 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) |
| 44 | - | 46 | - |
| 45 | -# .... and one using the zlib library linked via the command line | 47 | -# .... and one using the zlib library linked via the command line |
| @@ -48,11 +50,13 @@ index c032b3f..1ddad78 100644 | |||
| 48 | - $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | 50 | - $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 49 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) | 51 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) |
| 50 | - | 52 | - |
| 51 | -$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) | 53 | -$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(MAKEDIRS) |
| 52 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) | 54 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) |
| 53 | - | 55 | - |
| 54 | -$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) | 56 | -$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) |
| 55 | - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) | 57 | - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) |
| 58 | +## -------------------------- Auxiliary programs --------------------------- # | ||
| 59 | +# | ||
| 56 | +#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) | 60 | +#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) |
| 57 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) | 61 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) |
| 58 | +# | 62 | +# |
| @@ -77,7 +81,7 @@ index c032b3f..1ddad78 100644 | |||
| 77 | +# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | 81 | +# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 78 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) | 82 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) |
| 79 | +# | 83 | +# |
| 80 | +#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) | 84 | +#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(MAKEDIRS) |
| 81 | +# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) | 85 | +# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) |
| 82 | +# | 86 | +# |
| 83 | +## .... and one using the zlib library linked via the command line | 87 | +## .... and one using the zlib library linked via the command line |
| @@ -86,7 +90,7 @@ index c032b3f..1ddad78 100644 | |||
| 86 | +# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | 90 | +# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 87 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) | 91 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) |
| 88 | +# | 92 | +# |
| 89 | +#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) | 93 | +#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(MAKEDIRS) |
| 90 | +# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) | 94 | +# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) |
| 91 | +# | 95 | +# |
| 92 | +#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) | 96 | +#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) |
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch new file mode 100644 index 0000000000..d786482007 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 5d5c83c89be0cff29dde2267fa168e6f7146be8c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Mon, 4 May 2015 22:31:48 -0700 | ||
| 4 | Subject: [PATCH] base/gendev.c: fix for -Werror=return-type | ||
| 5 | |||
| 6 | Fixed: | ||
| 7 | base/gendev.c:80:1: error: return type defaults to 'int' [-Werror=return-type] | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 12 | --- | ||
| 13 | base/gendev.c | 1 + | ||
| 14 | 1 file changed, 1 insertion(+) | ||
| 15 | |||
| 16 | diff --git a/base/gendev.c b/base/gendev.c | ||
| 17 | index 68a745f..8058b5a 100644 | ||
| 18 | --- a/base/gendev.c | ||
| 19 | +++ b/base/gendev.c | ||
| 20 | @@ -77,6 +77,7 @@ static const char *indent_item = ""; | ||
| 21 | /* Forward definitions */ | ||
| 22 | void add_entry(config *, const char *, const char *, bool); | ||
| 23 | |||
| 24 | +int | ||
| 25 | main(int argc, char *argv[]) | ||
| 26 | { | ||
| 27 | config conf; | ||
| 28 | -- | ||
| 29 | 1.7.9.5 | ||
| 30 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.15.bb b/meta/recipes-extended/ghostscript/ghostscript_9.16.bb index 578883777d..ec4acc6661 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.15.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.16.bb | |||
| @@ -11,20 +11,21 @@ HOMEPAGE = "http://www.ghostscript.com" | |||
| 11 | SECTION = "console/utils" | 11 | SECTION = "console/utils" |
| 12 | 12 | ||
| 13 | LICENSE = "GPLv3" | 13 | LICENSE = "GPLv3" |
| 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=aad21ea85123608e6a0a58d54ee23567" | 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b17cea54743435ab2a581c237bea294a" |
| 15 | 15 | ||
| 16 | DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" | 16 | DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" |
| 17 | DEPENDS_class-native = "" | 17 | DEPENDS_class-native = "" |
| 18 | 18 | ||
| 19 | SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz" | 19 | SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz \ |
| 20 | file://ghostscript-9.15-parallel-make.patch \ | ||
| 21 | file://ghostscript-9.16-Werror-return-type.patch \ | ||
| 22 | " | ||
| 20 | 23 | ||
| 21 | SRC_URI = "${SRC_URI_BASE} \ | 24 | SRC_URI = "${SRC_URI_BASE} \ |
| 22 | file://ghostscript-9.02-prevent_recompiling.patch \ | 25 | file://ghostscript-9.02-prevent_recompiling.patch \ |
| 23 | file://ghostscript-9.02-genarch.patch \ | 26 | file://ghostscript-9.02-genarch.patch \ |
| 24 | file://objarch.h \ | 27 | file://objarch.h \ |
| 25 | file://ghostscript-9.02-parallel-make.patch \ | ||
| 26 | file://cups-no-gcrypt.patch \ | 28 | file://cups-no-gcrypt.patch \ |
| 27 | file://ghostscript-9.15-parallel-make.patch \ | ||
| 28 | " | 29 | " |
| 29 | 30 | ||
| 30 | SRC_URI_class-native = "${SRC_URI_BASE} \ | 31 | SRC_URI_class-native = "${SRC_URI_BASE} \ |
| @@ -32,10 +33,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \ | |||
| 32 | file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ | 33 | file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ |
| 33 | " | 34 | " |
| 34 | 35 | ||
| 35 | SRC_URI[md5sum] = "5a78ab0990ff6ec3a103576bc8777c46" | 36 | SRC_URI[md5sum] = "829319325bbdb83f5c81379a8f86f38f" |
| 36 | SRC_URI[sha256sum] = "27f11e4fe5b89857ae745687281d1e4daf9681edc858a3f7e8e77ef09609777a" | 37 | SRC_URI[sha256sum] = "746d77280cca8afdd3d4c2c1389e332ed9b0605bd107bcaae1d761b061d1a68d" |
| 37 | |||
| 38 | PR = "r1" | ||
| 39 | 38 | ||
| 40 | EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ | 39 | EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ |
| 41 | --with-fontpath=${datadir}/fonts \ | 40 | --with-fontpath=${datadir}/fonts \ |
