diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2017-07-17 16:40:39 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 12:36:36 +0100 |
| commit | 8a5890cc0b0a6c110edb36aec3614c3ebeb54e24 (patch) | |
| tree | 191b4f040f2bf73b801edc2457fda7a92e8f0bcf /meta/recipes-extended | |
| parent | 13d675b0f8968bcfdf36035fd959be285e3da378 (diff) | |
| download | openembedded-core-contrib-8a5890cc0b0a6c110edb36aec3614c3ebeb54e24.tar.gz | |
ghostscript: remove legacy patch png_mak.patch
png_mak.patch was created for ghostscript 9.16 and causes make circular
dependency now. Check source code base/png.mak after apply png_mak.patch:
Line 77: $(MAKEDIRS) : $(pnglibconf_h)
Line 83: $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt $(TOP_MAKEFILES) $(MAKEDIRS)
So remove png_mak.patch.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/png_mak.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.21.bb | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch b/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch deleted file mode 100644 index 8b84986ef2..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch +++ /dev/null @@ -1,32 +0,0 @@ -ghostscript: add dependency for pnglibconf.h - -When using parallel make jobs, we need to be sure that -pnglibconf.h is created before we try to reference it, -so add a rule to png.mak. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - -Rebase to 9.19 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - base/png.mak | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/base/png.mak b/base/png.mak -index fe5c6e2..8abb53a 100644 ---- a/base/png.mak -+++ b/base/png.mak -@@ -74,6 +74,8 @@ png.clean-not-config-clean : - - pnglibconf_h=$(PNGGENDIR)$(D)pnglibconf.h - -+$(MAKEDIRS) : $(pnglibconf_h) -+ - png.config-clean : - $(RM_) $(pnglibconf_h) - $(RM_) $(PNGGEN)lpg*.dev --- -2.8.1 - diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb index fb36a1345a..adad9fdbd2 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb @@ -22,7 +22,6 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/${BPN}-${PV}.tar.gz \ file://ghostscript-9.15-parallel-make.patch \ file://ghostscript-9.16-Werror-return-type.patch \ - file://png_mak.patch \ file://do-not-check-local-libpng-source.patch \ file://avoid-host-contamination.patch \ file://mkdir-p.patch \ |