diff options
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.05.bb | 15 |
2 files changed, 63 insertions, 3 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch new file mode 100644 index 0000000000..ce254f6ece --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch @@ -0,0 +1,51 @@ +ghostscript-native:fix disable-system-libtiff + +Modify configure to add the check to make sure +ghostscrip could work while system-libtiff is +disabled. + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Upstream-Status: Pending +--- +diff --git a/base/configure.ac b/base/configure.ac +index bb05105..4b817ac 100644 +--- a/base/configure.ac ++++ b/base/configure.ac +@@ -814,17 +814,23 @@ Disabling tiff output devices.]) + esac + + if test $SHARE_LIBTIFF -eq 0; then +- echo +- echo "Running libtiff configure script..." +- olddir=`pwd` +- cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS +- status=$? +- if test "$status" -ne 0 ; then +- AC_MSG_ERROR([libtiff configure script failed], $status) +- fi +- cd $olddir +- echo +- echo "Continuing with Ghostscript configuration..." ++ if test -e $LIBTIFFDIR/configure; then ++ echo ++ echo "Running libtiff configure script..." ++ olddir=`pwd` ++ cd $LIBTIFFDIR && ./configure --disable-jbig $SUBCONFIG_OPTS ++ status=$? ++ if test "$status" -ne 0 ; then ++ AC_MSG_ERROR([libtiff configure script failed], $status) ++ fi ++ cd $olddir ++ echo ++ echo "Continuing with Ghostscript configuration..." ++ else ++ AC_MSG_NOTICE([Could not find local copy of libtiff. ++Disabling tiff output devices.]) ++ fi ++ + fi + + AC_SUBST(SHARE_LIBTIFF) +-- +1.7.10.4 + diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb index 2789897917..93c503fb74 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb @@ -15,7 +15,7 @@ SECTION = "console/utils" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" -PR = "r4" +PR = "r5" DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" DEPENDS_class-native = "" @@ -31,8 +31,9 @@ SRC_URI = "${SRC_URI_BASE} \ " SRC_URI_class-native = "${SRC_URI_BASE} \ - file://0001-make-ghostscript-work-with-long-building-directory.patch \ - " + file://0001-make-ghostscript-work-with-long-building-directory.patch \ + file://ghostscript-native-fix-disable-system-libtiff.patch \ + " SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1" SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207" @@ -40,6 +41,14 @@ SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a1 EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \ --with-fontpath=${datadir}/fonts --with-install-cups --without-libidn" +# Explicity disable libtiff, fontconfig, +# freetype, cups for ghostscript-native +EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ + --without-jbig2dec --without-jasper \ + --with-fontpath=${datadir}/fonts \ + --without-libidn --disable-fontconfig \ + --disable-freetype --disable-cups" + # This has been fixed upstream but for now we need to subvert the check for time.h # http://bugs.ghostscript.com/show_bug.cgi?id=692443 # http://bugs.ghostscript.com/show_bug.cgi?id=692426 |