[Erp5-report] r40744 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov 25 22:53:54 2010
New Revision: 40744

URL: http://svn.erp5.org?rev=40744&view=rev
Log:
use our own libtiff (and libjpeg that is its dependency).

Modified:
    erp5/trunk/buildout/software-profiles/ghostscript.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/ghostscript.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/ghostscript.cfg?rev=40744&r1=40743&r2=40744&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/ghostscript.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/ghostscript.cfg [utf8] Thu Nov 25 22:53:54 2010
@@ -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

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40744&r1=40743&r2=40744&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Nov 25 22:53:54 2010
@@ -1784,8 +1784,11 @@ class AssertGhostscript(AssertSoftwareMi
       'libm',
       'libpthread',
       'libstdc++',
+      'libtiff',
       ], [
       'fontconfig',
+      'libjpeg',
+      'libtiff',
       ])
 
 class AssertFontconfig(AssertSoftwareMixin):