From 83c60c3a03efea4b023ba9631be174778bb3d90d Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 25 Nov 2010 16:36:10 +0000 Subject: [PATCH] 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 --- buildout/software-profiles/sphinx.cfg | 8 ++++++-- buildout/tests/assertSoftware.py | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/buildout/software-profiles/sphinx.cfg b/buildout/software-profiles/sphinx.cfg index aee9ccf82f..b8cd14b4a9 100644 --- a/buildout/software-profiles/sphinx.cfg +++ b/buildout/software-profiles/sphinx.cfg @@ -1,6 +1,7 @@ [buildout] parts = sphinx extends = + ../software-profiles/libexpat.cfg ../software-profiles/mysql-5.1.cfg ../software-profiles/zlib.cfg @@ -28,10 +29,13 @@ configure-options = --with-mysql-includes=${mysql-5.1:location}/include/mysql --with-mysql-libs=${mysql-5.1:location}/lib/mysql --with-libstemmer + --with-iconv + --without-pgsql + --without-unixodbc patch-options = -p1 patches = ${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} environment = - CPPFLAGS=-I${zlib:location}/include - LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mysql-5.1:location}/lib/mysql + 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 -Wl,-rpath ${libexpat:location}/lib diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index fc396ca473..15c1248878 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -1832,6 +1832,30 @@ class AssertFontconfig(AssertSoftwareMixin): self.assertLibraryList('parts/fontconfig/bin/fc-scan', self.lib_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): def test(self): -- 2.30.9