diff options
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 | 37 |
1 files changed, 15 insertions, 22 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 index 5834ffaf9f..a9afb9948c 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From a954bf29a5f906b3151dffbecb5856e02e1565da Mon Sep 17 00:00:00 2001 | 1 | From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Mon, 18 Jan 2016 01:00:30 -0500 | 3 | Date: Mon, 18 Jan 2016 01:00:30 -0500 |
4 | Subject: [PATCH 03/10] configure.ac: do not check local png source | 4 | Subject: [PATCH] configure.ac: do not check local png source |
5 | 5 | ||
6 | In oe-core, it did not need to compile local libpng | 6 | In oe-core, it did not need to compile local libpng |
7 | source in ghostscript, so do not check local png | 7 | source in ghostscript, so do not check local png |
@@ -11,28 +11,21 @@ libpng library. | |||
11 | Upstream-Status: Inappropriate [OE-Core specific] | 11 | Upstream-Status: Inappropriate [OE-Core specific] |
12 | 12 | ||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
14 | |||
14 | --- | 15 | --- |
15 | configure.ac | 4 ++-- | 16 | configure.ac | 2 +- |
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 18 | ||
18 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
19 | index 9341930..80a60b1 100644 | 20 | index 698abd3..e65ac8b 100644 |
20 | --- a/configure.ac | 21 | --- a/configure.ac |
21 | +++ b/configure.ac | 22 | +++ b/configure.ac |
22 | @@ -1114,11 +1114,11 @@ AC_SUBST(ZLIBDIR) | 23 | @@ -1241,7 +1241,7 @@ else |
23 | AC_SUBST(FT_SYS_ZLIB) | 24 | PNGDEVS='' |
24 | 25 | PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' | |
25 | dnl png for the png output device; it also requires zlib | 26 | AC_MSG_CHECKING([for local png library source]) |
26 | -LIBPNGDIR=src | 27 | - if test -f $srcdir/libpng/pngread.c; then |
27 | +LIBPNGDIR=$srcdir/libpng | 28 | + if false; then |
28 | PNGDEVS='' | 29 | AC_MSG_RESULT([yes]) |
29 | PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' | 30 | SHARE_LIBPNG=0 |
30 | AC_MSG_CHECKING([for local png library source]) | 31 | LIBPNGDIR=$srcdir/libpng |
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.8.3.1 | ||
38 | |||