diff options
| -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 @@ | |||
| 1 | ghostscript: add dependency for pnglibconf.h | ||
| 2 | |||
| 3 | When using parallel make jobs, we need to be sure that | ||
| 4 | pnglibconf.h is created before we try to reference it, | ||
| 5 | so add a rule to png.mak. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Joe Slater <jslater@windriver.com> | ||
| 10 | |||
| 11 | Rebase to 9.19 | ||
| 12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 13 | --- | ||
| 14 | base/png.mak | 2 ++ | ||
| 15 | 1 file changed, 2 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/base/png.mak b/base/png.mak | ||
| 18 | index 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 | -- | ||
| 31 | 2.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" | |||
| 22 | SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/${BPN}-${PV}.tar.gz \ | 22 | SRC_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 \ |
