[Erp5-report] r40294 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Nov 16 10:18:01 CET 2010
Author: kazuhiko
Date: Tue Nov 16 10:18:01 2010
New Revision: 40294
URL: http://svn.erp5.org?rev=40294&view=rev
Log:
we already have our own libexpat and pcre.
Modified:
erp5/trunk/buildout/software-profiles/apache.cfg
erp5/trunk/buildout/tests/assertSoftware.py
Modified: erp5/trunk/buildout/software-profiles/apache.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/apache.cfg?rev=40294&r1=40293&r2=40294&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/apache.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/apache.cfg [utf8] Tue Nov 16 10:18:01 2010
@@ -2,8 +2,10 @@
parts = apache
extends =
+ ../software-profiles/libexpat.cfg
../software-profiles/libuuid.cfg
../software-profiles/openssl.cfg
+ ../software-profiles/pcre.cfg
../software-profiles/zlib.cfg
[apache]
@@ -38,7 +40,9 @@ configure-options = --enable-authn-alias
--with-included-apr
--with-ssl=${openssl:location}
--with-z=${zlib:location}
+ --with-expat=${libexpat:location}
+ --with-pcre=${pcre:location}
environment =
CFLAGS =-I${libuuid:location}/include
- LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib
+ LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -Wl,-rpath -Wl,${libexpat:location}/lib -Wl,-rpath -Wl,${pcre:location}/lib
Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40294&r1=40293&r2=40294&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Tue Nov 16 10:18:01 2010
@@ -311,7 +311,7 @@ class AssertApache(unittest.TestCase):
'libpthread', 'libdl', 'libc', 'libuuid']), elf_dict['library_list'])
soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
- software in ['apache', 'zlib', 'openssl', 'libuuid']]
+ software in ['apache', 'zlib', 'openssl', 'libuuid', 'libexpat', 'pcre']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
def test_ld_libapr1(self):
@@ -321,16 +321,7 @@ class AssertApache(unittest.TestCase):
'libpthread', 'libdl', 'libc']), elf_dict['library_list'])
soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
- software in ['zlib', 'openssl', 'libuuid']]
- self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
-
- def test_ld_libexpat(self):
- """Checks proper linking of libexpat.so"""
- elf_dict = readElfAsDict('parts/apache/lib/libexpat.so')
- self.assertEqual(sorted(['libc']), elf_dict['library_list'])
- soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
- expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
- software in ['zlib', 'openssl']]
+ software in ['zlib', 'openssl', 'libuuid', 'libexpat', 'pcre']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
def test_modules(self):
More information about the Erp5-report
mailing list