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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Apr  7 14:50:30 2011
New Revision: 45176

URL: http://svn.erp5.org?rev=45176&view=rev
Log:
use our own pkg-config and libxml2.

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

Modified: erp5/trunk/buildout/software-profiles/fontconfig.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/fontconfig.cfg?rev=45176&r1=45175&r2=45176&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/fontconfig.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/fontconfig.cfg [utf8] Thu Apr  7 14:50:30 2011
@@ -2,7 +2,8 @@
 extends =
   fonts.cfg
   freetype.cfg
-  libexpat.cfg
+  libxml2.cfg
+  pkgconfig.cfg
   zlib.cfg
 
 parts =
@@ -14,9 +15,11 @@ url = http://fontconfig.org/release/font
 md5sum = 77e15a92006ddc2adbb06f840d591c0e
 configure-options =
   --disable-docs
+  --enable-libxml2
   --with-default-fonts=${fonts:location}
-  --with-expat=${libexpat:location}
   --with-freetype-config=${freetype:location}/bin/freetype-config
 environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=45176&r1=45175&r2=45176&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Apr  7 14:50:30 2011
@@ -1849,13 +1849,14 @@ class AssertGhostscript(AssertSoftwareMi
 class AssertFontconfig(AssertSoftwareMixin):
   core_lib_list = [
       'libc',
-      'libexpat',
       'libfreetype',
+      'libm',
+      'libxml2',
       'libz',
       ]
   core_rpath_list = [
       'freetype',
-      'libexpat',
+      'libxml2',
       'zlib',
       ]