mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
ghostscript: remove unneeded patch
The patch has been added here https://git.yoctoproject.org/poky/commit/?id=ca63a0158ae42010477080ad6bb776329f1230b0 and isn't necessary anymore, as cross compilation works fine without it. (From OE-Core rev: 37e521d8a5d1a89ba46d5058bc9c86cbe2195652) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0caa3bb889
commit
8528cae27a
@@ -1,78 +0,0 @@
|
||||
From 239d681306a8d97ed10954788d32ba2f4b55f77c Mon Sep 17 00:00:00 2001
|
||||
From: Kang Kai <kai.kang@windriver.com>
|
||||
Date: Thu, 29 Mar 2018 16:10:16 +0800
|
||||
Subject: [PATCH 06/10] prevent recompiling
|
||||
|
||||
Just use commands provided by ghostscript-native, preventing recompile
|
||||
them when compile ghostscript. Way to enable cross compile.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Kang Kai <kai.kang@windriver.com>
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
|
||||
Rebase to 9.25
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
|
||||
---
|
||||
base/unix-aux.mak | 44 --------------------------------------------
|
||||
1 file changed, 44 deletions(-)
|
||||
|
||||
diff --git a/base/unix-aux.mak b/base/unix-aux.mak
|
||||
index 5bf72e9..9cb39d7 100644
|
||||
--- a/base/unix-aux.mak
|
||||
+++ b/base/unix-aux.mak
|
||||
@@ -54,50 +54,6 @@ $(AUX)gp_stdia.$(OBJ): $(GLSRC)gp_stdia.
|
||||
$(stdio__h) $(time__h) $(unistd__h) $(gx_h) $(gp_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
$(GLCCAUX) $(AUXO_)gp_stdia.$(OBJ) $(C_) $(GLSRC)gp_stdia.c
|
||||
|
||||
-# -------------------------- Auxiliary programs --------------------------- #
|
||||
-
|
||||
-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
|
||||
-
|
||||
-$(PACKPS_XE): $(GLSRC)pack_ps.c $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(PACKPS_XE) $(GLSRC)pack_ps.c $(AUXEXTRALIBS)
|
||||
-
|
||||
-# On the RS/6000 (at least), compiling genarch.c with gcc with -O
|
||||
-# produces a buggy executable.
|
||||
-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
|
||||
-
|
||||
-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
|
||||
-
|
||||
-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
|
||||
-
|
||||
-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
|
||||
-
|
||||
-# To get GS to use the system zlib, you remove/hide the gs/zlib directory
|
||||
-# which means that the mkromfs build can't find the zlib source it needs.
|
||||
-# So it's split into two targets, one using the zlib source directly.....
|
||||
-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
|
||||
- $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
|
||||
- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
|
||||
-
|
||||
-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
|
||||
-
|
||||
-# .... and one using the zlib library linked via the command line
|
||||
-MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
|
||||
- $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
|
||||
- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
|
||||
- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
|
||||
-
|
||||
-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
|
||||
-
|
||||
-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS)
|
||||
- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
|
||||
-
|
||||
# Query the environment to construct gconfig_.h.
|
||||
# These are all defined conditionally (except the JasPER one), so that
|
||||
# they can be overridden by settings from the configure script.
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -36,7 +36,6 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d
|
||||
"
|
||||
|
||||
SRC_URI = "${SRC_URI_BASE} \
|
||||
file://ghostscript-9.21-prevent_recompiling.patch \
|
||||
file://cups-no-gcrypt.patch \
|
||||
"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user