Commit 83c60c3a authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

update sphinx.cfg:

* use our own libexpat.
* enable/disable features explicitly.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40725 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7921bf8c
[buildout] [buildout]
parts = sphinx parts = sphinx
extends = extends =
../software-profiles/libexpat.cfg
../software-profiles/mysql-5.1.cfg ../software-profiles/mysql-5.1.cfg
../software-profiles/zlib.cfg ../software-profiles/zlib.cfg
...@@ -28,10 +29,13 @@ configure-options = ...@@ -28,10 +29,13 @@ configure-options =
--with-mysql-includes=${mysql-5.1:location}/include/mysql --with-mysql-includes=${mysql-5.1:location}/include/mysql
--with-mysql-libs=${mysql-5.1:location}/lib/mysql --with-mysql-libs=${mysql-5.1:location}/lib/mysql
--with-libstemmer --with-libstemmer
--with-iconv
--without-pgsql
--without-unixodbc
patch-options = -p1 patch-options = -p1
patches = patches =
${sphinx-1.10-fix_nosigpipe.patch:location}/${sphinx-1.10-fix_nosigpipe.patch:filename} ${sphinx-1.10-fix_nosigpipe.patch:location}/${sphinx-1.10-fix_nosigpipe.patch:filename}
${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename} ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
environment = environment =
CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mysql-5.1:location}/lib/mysql LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mysql-5.1:location}/lib/mysql -Wl,-rpath ${libexpat:location}/lib
...@@ -1832,6 +1832,30 @@ class AssertFontconfig(AssertSoftwareMixin): ...@@ -1832,6 +1832,30 @@ class AssertFontconfig(AssertSoftwareMixin):
self.assertLibraryList('parts/fontconfig/bin/fc-scan', self.lib_list, self.assertLibraryList('parts/fontconfig/bin/fc-scan', self.lib_list,
self.rpath_list) self.rpath_list)
class AssertSphinx(AssertSoftwareMixin):
core_lib_list = [
'libc',
'libexpat',
'libgcc_s',
'libm',
'libmysqlclient',
'libpthread',
'librt',
'libstdc++',
'libz',
]
core_rpath_list = [
'libexpat',
'zlib'
]
core_additional_rpath_list = [
os.path.join(os.path.abspath(os.curdir), 'parts', 'mysql-5.1', 'lib', 'mysql')
]
def test_ld_sphinx(self):
for i in ('indexer', 'indextool', 'search', 'searchd', 'spelldump'):
self.assertLibraryList('parts/sphinx/bin/%s' % i,
self.core_lib_list, self.core_rpath_list, self.core_additional_rpath_list)
class AssertElfLinkedInternally(AssertSoftwareMixin): class AssertElfLinkedInternally(AssertSoftwareMixin):
def test(self): def test(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