From 4b7bda9d1ac836de0c657cca28044b822e444bea Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Fri, 4 Dec 2015 15:13:15 -0800 Subject: 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. Signed-off-by: Joe Slater Signed-off-by: Ross Burton (cherry picked from commit fad19750d23aad2d14a1726c4e3c2c0d05f6e13d) Signed-off-by: Saul Wold --- .../ghostscript/ghostscript/png_mak.patch | 21 +++++++++++++++++++++ .../ghostscript/ghostscript_9.16.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/png_mak.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch b/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch new file mode 100644 index 0000000000..da900ead3a --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch @@ -0,0 +1,21 @@ +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 + +--- a/base/png.mak ++++ b/base/png.mak +@@ -81,6 +81,8 @@ png.config-clean : + $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt + $(CP_) $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt $(pnglibconf_h) + ++$(MAKEDIRS) : $(pnglibconf_h) ++ + PDEP=$(AK) $(pnglibconf_h) $(MAKEDIRS) + + png_1=$(PNGOBJ)png.$(OBJ) $(PNGOBJ)pngmem.$(OBJ) $(PNGOBJ)pngerror.$(OBJ) $(PNGOBJ)pngset.$(OBJ) diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.16.bb b/meta/recipes-extended/ghostscript/ghostscript_9.16.bb index ec4acc6661..d584c49b07 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.16.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.16.bb @@ -19,6 +19,7 @@ DEPENDS_class-native = "" SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz \ file://ghostscript-9.15-parallel-make.patch \ file://ghostscript-9.16-Werror-return-type.patch \ + file://png_mak.patch \ " SRC_URI = "${SRC_URI_BASE} \ -- cgit 1.2.3-korg