diff options
author | Joe Slater <jslater@windriver.com> | 2017-06-15 14:35:26 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-23 11:44:13 +0100 |
commit | d3e8504ce7a25908fe5ad7973d807d199950dc9a (patch) | |
tree | 767fdefdb315ad3dabe68ec465f92d9816b06fe3 /meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch | |
parent | a16d0f6c496f4c8c61accbabd6769839bda62f36 (diff) | |
download | poky-d3e8504ce7a25908fe5ad7973d807d199950dc9a.tar.gz |
ghostscript: move to version 9.21
Eliminate CVE patches that are now in source.
Add CUPSCONFIG to configure options.
(From OE-Core rev: 3041f94896b50a5a5d19caf0dd0e7910c730e18e)
Signed-off-by: Joe Slater <jslater@windriver.com>
to be scrunched
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch')
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch | 99 |
1 files changed, 0 insertions, 99 deletions
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 deleted file mode 100644 index e709195d8c..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | Just use commands provided by ghostscript-native, preventing recompile them when | ||
2 | compile ghostscript. | ||
3 | Way to enable cross compile. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | ||
8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
9 | |||
10 | Rebase to 9.19 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
12 | --- | ||
13 | base/unix-aux.mak | 64 +++++++++++++++++++++++++++---------------------------- | ||
14 | 1 file changed, 32 insertions(+), 32 deletions(-) | ||
15 | |||
16 | diff --git a/base/unix-aux.mak b/base/unix-aux.mak | ||
17 | index 0110667..e2eb1a1 100644 | ||
18 | --- a/base/unix-aux.mak | ||
19 | +++ b/base/unix-aux.mak | ||
20 | @@ -71,44 +71,44 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\ | ||
21 | |||
22 | # -------------------------- Auxiliary programs --------------------------- # | ||
23 | |||
24 | -$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
25 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) | ||
26 | - | ||
27 | +#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
28 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) | ||
29 | +# | ||
30 | # On the RS/6000 (at least), compiling genarch.c with gcc with -O | ||
31 | # produces a buggy executable. | ||
32 | -$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
33 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) | ||
34 | - | ||
35 | -$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
36 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) | ||
37 | - | ||
38 | -$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
39 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) | ||
40 | - | ||
41 | -$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
42 | - $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) | ||
43 | - | ||
44 | +#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
45 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) | ||
46 | +# | ||
47 | +#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
48 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) | ||
49 | +# | ||
50 | +#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
51 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) | ||
52 | +# | ||
53 | +#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
54 | +# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) | ||
55 | +# | ||
56 | # To get GS to use the system zlib, you remove/hide the gs/zlib directory | ||
57 | # which means that the mkromfs build can't find the zlib source it needs. | ||
58 | # So it's split into two targets, one using the zlib source directly..... | ||
59 | -MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | ||
60 | - $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
61 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) | ||
62 | - | ||
63 | -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
64 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) | ||
65 | - | ||
66 | +#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | ||
67 | +# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
68 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) | ||
69 | +# | ||
70 | +#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
71 | +# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) | ||
72 | +# | ||
73 | # .... and one using the zlib library linked via the command line | ||
74 | -MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ | ||
75 | - $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | ||
76 | - $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
77 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) | ||
78 | - | ||
79 | -$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
80 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) | ||
81 | - | ||
82 | -$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
83 | - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) | ||
84 | +#MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ | ||
85 | +# $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | ||
86 | +# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
87 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) | ||
88 | +# | ||
89 | +#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(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) | ||
91 | +# | ||
92 | +#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
93 | +# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) | ||
94 | |||
95 | # Query the environment to construct gconfig_.h. | ||
96 | # These are all defined conditionally (except the JasPER one), so that | ||
97 | -- | ||
98 | 2.8.1 | ||
99 | |||