Commit 9fdb7006 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

use our own freetype and fontconfig.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41005 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 17d37d49
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
parts = parts =
graphviz graphviz
extends = extends =
../software-profiles/fontconfig.cfg
../software-profiles/freetype.cfg
../software-profiles/libpng.cfg ../software-profiles/libpng.cfg
../software-profiles/libtool.cfg ../software-profiles/libtool.cfg
../software-profiles/pkgconfig.cfg
../software-profiles/zlib.cfg ../software-profiles/zlib.cfg
[graphviz] [graphviz]
...@@ -20,6 +23,8 @@ configure-options = ...@@ -20,6 +23,8 @@ configure-options =
--with-pnglibdir=${libpng:location}/lib --with-pnglibdir=${libpng:location}/lib
--with-zincludedir=${zlib:location}/include --with-zincludedir=${zlib:location}/include
--with-zlibdir=${zlib:location}/lib --with-zlibdir=${zlib:location}/lib
--with-freetype2
--with-fontconfig
--disable-swig --disable-swig
--disable-sharp --disable-sharp
--disable-guile --disable-guile
...@@ -42,10 +47,10 @@ configure-options = ...@@ -42,10 +47,10 @@ configure-options =
--without-pangocairo --without-pangocairo
--without-lasi --without-lasi
--without-glitz --without-glitz
--without-freetype2
--without-fontconfig
--without-jpeg --without-jpeg
--without-glut --without-glut
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
CFLAGS =-I${zlib:location}/include CFLAGS =-I${zlib:location}/include
LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
...@@ -2217,6 +2217,29 @@ class AssertGraphviz(AssertSoftwareMixin): ...@@ -2217,6 +2217,29 @@ class AssertGraphviz(AssertSoftwareMixin):
'zlib', 'zlib',
'graphviz', 'graphviz',
]) ])
def test_ld_libgvplugin_gd(self):
self.assertLibraryList('parts/graphviz/lib/graphviz/libgvplugin_gd.so', [
'libc',
'libcdt',
'libdl',
'libexpat',
'libfontconfig',
'libfreetype',
'libgvc',
'libgraph',
'libm',
'libpathplan',
'libpng14',
'libxdot',
'libz',
], [
'fontconfig',
'freetype',
'graphviz',
'libexpat',
'libpng',
'zlib',
])
class AssertPkgconfig(AssertSoftwareMixin): class AssertPkgconfig(AssertSoftwareMixin):
def test_ld_dot(self): def test_ld_dot(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment