diff options
Diffstat (limited to 'meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch')
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch | 79 |
1 files changed, 30 insertions, 49 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch index f2c6d04e06..e39d23d467 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch | |||
@@ -1,32 +1,40 @@ | |||
1 | Just use commands provided by ghostscript-native, preventing recompile them when | 1 | From 239d681306a8d97ed10954788d32ba2f4b55f77c Mon Sep 17 00:00:00 2001 |
2 | compile ghostscript. | 2 | From: Kang Kai <kai.kang@windriver.com> |
3 | Way to enable cross compile. | 3 | Date: Thu, 29 Mar 2018 16:10:16 +0800 |
4 | Subject: [PATCH 06/10] prevent recompiling | ||
5 | |||
6 | Just use commands provided by ghostscript-native, preventing recompile | ||
7 | them when compile ghostscript. Way to enable cross compile. | ||
4 | 8 | ||
5 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
6 | 10 | ||
7 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | 11 | Signed-off-by: Kang Kai <kai.kang@windriver.com> |
8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 12 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
9 | 13 | ||
10 | Rebase to 9.19 | 14 | Rebase to 9.23 |
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
16 | --- | ||
17 | base/unix-aux.mak | 44 -------------------------------------------- | ||
18 | 1 file changed, 44 deletions(-) | ||
12 | 19 | ||
13 | Rebase to 9.21 | 20 | diff --git a/base/unix-aux.mak b/base/unix-aux.mak |
14 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 21 | index 5bf72e9..9cb39d7 100644 |
15 | |||
16 | --- a/base/unix-aux.mak | 22 | --- a/base/unix-aux.mak |
17 | +++ b/base/unix-aux.mak | 23 | +++ b/base/unix-aux.mak |
18 | @@ -66,45 +66,45 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv. | 24 | @@ -64,50 +64,6 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\ |
19 | 25 | $(UNIX_AUX_MAK) $(MAKEDIRS) | |
20 | # -------------------------- Auxiliary programs --------------------------- # | 26 | $(GLCC) $(GLO_)gp_sysv.$(OBJ) $(C_) $(GLSRC)gp_sysv.c |
21 | 27 | ||
28 | -# -------------------------- Auxiliary programs --------------------------- # | ||
29 | - | ||
22 | -$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) | 30 | -$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) |
23 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) | 31 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) |
24 | - | 32 | - |
25 | +#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) | 33 | -$(PACKPS_XE): $(GLSRC)pack_ps.c $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) |
26 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) | 34 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(PACKPS_XE) $(GLSRC)pack_ps.c $(AUXEXTRALIBS) |
27 | +# | 35 | - |
28 | # On the RS/6000 (at least), compiling genarch.c with gcc with -O | 36 | -# On the RS/6000 (at least), compiling genarch.c with gcc with -O |
29 | # produces a buggy executable. | 37 | -# produces a buggy executable. |
30 | -$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | 38 | -$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) |
31 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) | 39 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) |
32 | - | 40 | - |
@@ -39,21 +47,9 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
39 | -$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | 47 | -$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) |
40 | - $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) | 48 | - $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) |
41 | - | 49 | - |
42 | +#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | 50 | -# To get GS to use the system zlib, you remove/hide the gs/zlib directory |
43 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) | 51 | -# which means that the mkromfs build can't find the zlib source it needs. |
44 | +# | 52 | -# So it's split into two targets, one using the zlib source directly..... |
45 | +#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
46 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) | ||
47 | +# | ||
48 | +#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
49 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) | ||
50 | +# | ||
51 | +#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
52 | +# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) | ||
53 | +# | ||
54 | # To get GS to use the system zlib, you remove/hide the gs/zlib directory | ||
55 | # which means that the mkromfs build can't find the zlib source it needs. | ||
56 | # So it's split into two targets, one using the zlib source directly..... | ||
57 | -MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | 53 | -MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ |
58 | - $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | 54 | - $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
59 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) | 55 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) |
@@ -61,14 +57,7 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
61 | -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) | 57 | -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) |
62 | - $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) | 58 | - $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) |
63 | - | 59 | - |
64 | +#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | 60 | -# .... and one using the zlib library linked via the command line |
65 | +# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
66 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) | ||
67 | +# | ||
68 | +#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
69 | +# $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) | ||
70 | +# | ||
71 | # .... and one using the zlib library linked via the command line | ||
72 | -MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ | 61 | -MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ |
73 | - $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | 62 | - $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ |
74 | - $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | 63 | - $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
@@ -80,17 +69,9 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
80 | -$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS) | 69 | -$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS) |
81 | - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) | 70 | - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) |
82 | - | 71 | - |
83 | +#MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ | ||
84 | +# $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | ||
85 | +# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
86 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) | ||
87 | +# | ||
88 | +#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
89 | +# $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) | ||
90 | +# | ||
91 | +#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
92 | +# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) | ||
93 | +# | ||
94 | # Query the environment to construct gconfig_.h. | 72 | # Query the environment to construct gconfig_.h. |
95 | # These are all defined conditionally (except the JasPER one), so that | 73 | # These are all defined conditionally (except the JasPER one), so that |
96 | # they can be overridden by settings from the configure script. | 74 | # they can be overridden by settings from the configure script. |
75 | -- | ||
76 | 1.8.3.1 | ||
77 | |||