diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/png_mak.patch | 21 | ||||
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.16.bb | 1 |
2 files changed, 22 insertions, 0 deletions
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 @@ | |||
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 | --- a/base/png.mak | ||
12 | +++ b/base/png.mak | ||
13 | @@ -81,6 +81,8 @@ png.config-clean : | ||
14 | $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt | ||
15 | $(CP_) $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt $(pnglibconf_h) | ||
16 | |||
17 | +$(MAKEDIRS) : $(pnglibconf_h) | ||
18 | + | ||
19 | PDEP=$(AK) $(pnglibconf_h) $(MAKEDIRS) | ||
20 | |||
21 | 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 = "" | |||
19 | SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz \ | 19 | SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz \ |
20 | file://ghostscript-9.15-parallel-make.patch \ | 20 | file://ghostscript-9.15-parallel-make.patch \ |
21 | file://ghostscript-9.16-Werror-return-type.patch \ | 21 | file://ghostscript-9.16-Werror-return-type.patch \ |
22 | file://png_mak.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI = "${SRC_URI_BASE} \ | 25 | SRC_URI = "${SRC_URI_BASE} \ |