summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2017-07-17 16:40:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-21 22:51:37 +0100
commit744460e9f21122f89dca0f5c7bcd0d95d87a1719 (patch)
tree7dcef0eb428a51a95451ad22c021c436d7fce54e /meta
parentd66314a18c0c1aeeef50185635dbbe76e48b72d1 (diff)
downloadpoky-744460e9f21122f89dca0f5c7bcd0d95d87a1719.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. (From OE-Core rev: 8a5890cc0b0a6c110edb36aec3614c3ebeb54e24) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/png_mak.patch32
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.21.bb1
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 @@
1ghostscript: add dependency for pnglibconf.h
2
3When using parallel make jobs, we need to be sure that
4pnglibconf.h is created before we try to reference it,
5so add a rule to png.mak.
6
7Upstream-Status: Pending
8
9Signed-off-by: Joe Slater <jslater@windriver.com>
10
11Rebase to 9.19
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 base/png.mak | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/base/png.mak b/base/png.mak
18index fe5c6e2..8abb53a 100644
19--- a/base/png.mak
20+++ b/base/png.mak
21@@ -74,6 +74,8 @@ png.clean-not-config-clean :
22
23 pnglibconf_h=$(PNGGENDIR)$(D)pnglibconf.h
24
25+$(MAKEDIRS) : $(pnglibconf_h)
26+
27 png.config-clean :
28 $(RM_) $(pnglibconf_h)
29 $(RM_) $(PNGGEN)lpg*.dev
30--
312.8.1
32
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"
22SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/${BPN}-${PV}.tar.gz \ 22SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/${BPN}-${PV}.tar.gz \
23 file://ghostscript-9.15-parallel-make.patch \ 23 file://ghostscript-9.15-parallel-make.patch \
24 file://ghostscript-9.16-Werror-return-type.patch \ 24 file://ghostscript-9.16-Werror-return-type.patch \
25 file://png_mak.patch \
26 file://do-not-check-local-libpng-source.patch \ 25 file://do-not-check-local-libpng-source.patch \
27 file://avoid-host-contamination.patch \ 26 file://avoid-host-contamination.patch \
28 file://mkdir-p.patch \ 27 file://mkdir-p.patch \