diff --git a/buildout/software-profiles/ghostscript.cfg b/buildout/software-profiles/ghostscript.cfg index 92dd49c625e89d3a9f7765111d60f71680a417ec..7835156c0abdb912c672f66b55b50bd4a1aa8420 100644 --- a/buildout/software-profiles/ghostscript.cfg +++ b/buildout/software-profiles/ghostscript.cfg @@ -1,6 +1,8 @@ [buildout] extends = ../software-profiles/fontconfig.cfg + ../software-profiles/libjpeg.cfg + ../software-profiles/libtiff.cfg parts = ghostscript @@ -14,15 +16,17 @@ download-only = true [ghostscript-common] recipe = hexagonit.recipe.cmmi pre-configure-hook = ${ghostscript-hooks-download:location}/${ghostscript-hooks-download:filename}:pre_configure_hook -# we don't include TIFF output driver because the linking might fail if -# libjbig-devel is installed, and it is not required for our purpose anyway. configure-options = - --disable-cups --without-x --with-drivers=BMP,PBM,PNG,PS + --disable-cups + --disable-cairo + --without-x + --with-drivers=FILES # it seems that parallel build sometimes fails for ghostscript. make-options = -j1 environment = PKG_CONFIG_PATH =${fontconfig:location}/lib/pkgconfig - LDFLAGS=-Wl,-rpath -Wl,${fontconfig:location}/lib + CPPFLAGS=-I${libtiff:location}/include + LDFLAGS=-Wl,-rpath -Wl,${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib [ghostscript] # we prefer ghostscript-8 for now, because ghostscript-9.00 seems to have a diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 15c12488781d14b39d3b81f735e1e10c37b624df..03120150ffbde27524f5cad2a57afc8d19fc89a2 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -1784,8 +1784,11 @@ class AssertGhostscript(AssertSoftwareMixin): 'libm', 'libpthread', 'libstdc++', + 'libtiff', ], [ 'fontconfig', + 'libjpeg', + 'libtiff', ]) class AssertFontconfig(AssertSoftwareMixin):