Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | ust 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 | diff --git a/base/unix-aux.mak b/base/unix-aux.mak |
| 11 | index a91fb26..c991d11 100644 |
| 12 | --- a/base/unix-aux.mak |
| 13 | +++ b/base/unix-aux.mak |
| 14 | @@ -69,46 +69,46 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\ |
| 15 | $(MAKEDIRS) |
| 16 | $(GLCC) $(GLO_)gp_sysv.$(OBJ) $(C_) $(GLSRC)gp_sysv.c |
| 17 | |
| 18 | -# -------------------------- Auxiliary programs --------------------------- # |
| 19 | - |
| 20 | -$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) |
| 21 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) |
| 22 | - |
| 23 | -# On the RS/6000 (at least), compiling genarch.c with gcc with -O |
| 24 | -# produces a buggy executable. |
| 25 | -$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS) |
| 26 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) |
| 27 | - |
| 28 | -$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) |
| 29 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) |
| 30 | - |
| 31 | -$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) |
| 32 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) |
| 33 | - |
| 34 | -$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) |
| 35 | - $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) |
| 36 | - |
| 37 | -# To get GS to use the system zlib, you remove/hide the gs/zlib directory |
| 38 | -# which means that the mkromfs build can't find the zlib source it needs. |
| 39 | -# So it's split into two targets, one using the zlib source directly..... |
| 40 | -MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ |
| 41 | - $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 42 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) |
| 43 | - |
| 44 | -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(MAKEDIRS) |
| 45 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) |
| 46 | - |
| 47 | -# .... and one using the zlib library linked via the command line |
| 48 | -MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ |
| 49 | - $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ |
| 50 | - $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 51 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) |
| 52 | - |
| 53 | -$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(MAKEDIRS) |
| 54 | - $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) |
| 55 | - |
| 56 | -$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) |
| 57 | - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) |
| 58 | +## -------------------------- Auxiliary programs --------------------------- # |
| 59 | +# |
| 60 | +#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) |
| 61 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) |
| 62 | +# |
| 63 | +## On the RS/6000 (at least), compiling genarch.c with gcc with -O |
| 64 | +## produces a buggy executable. |
| 65 | +#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS) |
| 66 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) |
| 67 | +# |
| 68 | +#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) |
| 69 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) |
| 70 | +# |
| 71 | +#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) |
| 72 | +# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) |
| 73 | +# |
| 74 | +#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) |
| 75 | +# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) |
| 76 | +# |
| 77 | +## To get GS to use the system zlib, you remove/hide the gs/zlib directory |
| 78 | +## which means that the mkromfs build can't find the zlib source it needs. |
| 79 | +## So it's split into two targets, one using the zlib source directly..... |
| 80 | +#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ |
| 81 | +# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 82 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) |
| 83 | +# |
| 84 | +#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(MAKEDIRS) |
| 85 | +# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) |
| 86 | +# |
| 87 | +## .... and one using the zlib library linked via the command line |
| 88 | +#MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ |
| 89 | +# $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ |
| 90 | +# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ |
| 91 | +# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) |
| 92 | +# |
| 93 | +#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(MAKEDIRS) |
| 94 | +# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) |
| 95 | +# |
| 96 | +#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) |
| 97 | +# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) |
| 98 | |
| 99 | # Query the environment to construct gconfig_.h. |
| 100 | # These are all defined conditionally (except the JasPER one), so that |