diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2016-02-29 19:41:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 16:58:12 +0000 |
commit | ee8ff4263476f2f5c45c08b212e0e7423e6abedf (patch) | |
tree | da96eda24a596dca6255ac8b61542e96ee842f01 /meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch | |
parent | 3f5725c8458e31a2403ba643a5de0ada42f7e277 (diff) | |
download | poky-ee8ff4263476f2f5c45c08b212e0e7423e6abedf.tar.gz |
ghostscript: 9.16 -> 9.18
- Backport patches to fix build failure caused by
'--without-jbig2dec' and '--without-jbig2dec'.
...
|make[1]: *** No rule to make target `obj/sjbig2_.dev',
needed by `obj/sjbig2.dev'. Stop.
...
http://bugs.ghostscript.com/show_bug.cgi?id=696497
- Previously, it did not build the whole local libpng
source in ghostscript, only picked up specific files
and compile them. But on ghostscript 9.18, when the
arm's FPU has been set to NEON (-mfpu=neon * with GCC),
the selected file "libpng/pngrutil.c" needs to link
'png_init_filter_functions_neon' which should be
compiled by a non-selected file "libpng/arm/arm_init.c".
...
|./obj/pngrutil.o: In function `png_init_filter_functions':
|armv7a-neon-poky-linux-gnueabi/ghostscript/9.18-r0/build/../
ghostscript-9.18/libpng/pngrutil.c:3921: undefined reference to
`png_init_filter_functions_neon'
...
So do not compile local libpng source in ghostscript,
use shared libpng to instead.
(From OE-Core rev: c7da39c43fc20e634c45212151400c663b39399a)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch')
-rw-r--r-- | meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch new file mode 100644 index 0000000000..b445a6c9e9 --- /dev/null +++ b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 5ef8b85bc98f3bd9a15d5f47e24d3e23ae27c265 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Mon, 18 Jan 2016 01:00:30 -0500 | ||
4 | Subject: [PATCH] configure.ac: do not check local png source | ||
5 | |||
6 | In oe-core, it did not need to compile local libpng | ||
7 | source in ghostscript, so do not check local png | ||
8 | source, and directly check the existance of shared | ||
9 | libpng library. | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE-Core specific] | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | ||
15 | configure.ac | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index ab30a97..b762fd7 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -955,11 +955,11 @@ AC_SUBST(ZLIBDIR) | ||
23 | AC_SUBST(FT_SYS_ZLIB) | ||
24 | |||
25 | dnl png for the png output device; it also requires zlib | ||
26 | -LIBPNGDIR=src | ||
27 | +LIBPNGDIR=$srcdir/libpng | ||
28 | PNGDEVS='' | ||
29 | PNGDEVS_ALL='png48 png16m pnggray pngmono png256 png16 pngalpha' | ||
30 | AC_MSG_CHECKING([for local png library source]) | ||
31 | -if test -f $srcdir/libpng/pngread.c; then | ||
32 | +if false; then | ||
33 | AC_MSG_RESULT([yes]) | ||
34 | SHARE_LIBPNG=0 | ||
35 | LIBPNGDIR=$srcdir/libpng | ||
36 | -- | ||
37 | 1.9.1 | ||
38 | |||