Commit 2fedd75a authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

use our own pkg-config and libxml2.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45176 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1315e621
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
extends = extends =
fonts.cfg fonts.cfg
freetype.cfg freetype.cfg
libexpat.cfg libxml2.cfg
pkgconfig.cfg
zlib.cfg zlib.cfg
parts = parts =
...@@ -14,9 +15,11 @@ url = http://fontconfig.org/release/fontconfig-2.8.0.tar.gz ...@@ -14,9 +15,11 @@ url = http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
md5sum = 77e15a92006ddc2adbb06f840d591c0e md5sum = 77e15a92006ddc2adbb06f840d591c0e
configure-options = configure-options =
--disable-docs --disable-docs
--enable-libxml2
--with-default-fonts=${fonts:location} --with-default-fonts=${fonts:location}
--with-expat=${libexpat:location}
--with-freetype-config=${freetype:location}/bin/freetype-config --with-freetype-config=${freetype:location}/bin/freetype-config
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-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
...@@ -1849,13 +1849,14 @@ class AssertGhostscript(AssertSoftwareMixin): ...@@ -1849,13 +1849,14 @@ class AssertGhostscript(AssertSoftwareMixin):
class AssertFontconfig(AssertSoftwareMixin): class AssertFontconfig(AssertSoftwareMixin):
core_lib_list = [ core_lib_list = [
'libc', 'libc',
'libexpat',
'libfreetype', 'libfreetype',
'libm',
'libxml2',
'libz', 'libz',
] ]
core_rpath_list = [ core_rpath_list = [
'freetype', 'freetype',
'libexpat', 'libxml2',
'zlib', 'zlib',
] ]
......
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