Commit fc5c2666 authored by Łukasz Nowak's avatar Łukasz Nowak

- do not use gssapi

 - force libxml2, disallow expat
 - force posix threads in ssl
 - add libpthread
 - make assertion lists diff friendly


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40514 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent da03f209
...@@ -13,6 +13,10 @@ md5sum = ff369e69ef0f0143beb5626164e87ae2 ...@@ -13,6 +13,10 @@ md5sum = ff369e69ef0f0143beb5626164e87ae2
configure-options = configure-options =
--enable-shared --enable-shared
--with-ssl=openssl --with-ssl=openssl
--without-expat
--without-gssapi
--with-libxml2
--enable-threadsafe-ssl=posix
environment = environment =
PATH=${libxml2:location}/bin:%(PATH)s PATH=${libxml2:location}/bin:%(PATH)s
CPPFLAGS=-I${openssl:location}/include -I{zlib:location}/include CPPFLAGS=-I${openssl:location}/include -I{zlib:location}/include
......
...@@ -795,12 +795,23 @@ class AssertNeon(AssertSoftwareMixin): ...@@ -795,12 +795,23 @@ class AssertNeon(AssertSoftwareMixin):
def test_ld_libneon(self): def test_ld_libneon(self):
elf_dict = readElfAsDict('parts/neon/lib/libneon.so') elf_dict = readElfAsDict('parts/neon/lib/libneon.so')
self.assertEqual(sorted([ self.assertEqual(sorted([
'libc', 'libcrypto', 'libxml2', 'libdl', 'libm', 'libssl', 'libz', 'libc',
'libcrypto',
'libdl',
'libm',
'libpthread',
'libssl',
'libxml2',
'libz',
]), ]),
elf_dict['library_list']) elf_dict['library_list'])
soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts') soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
software in ['openssl', 'libxml2', 'zlib']] software in [
'libxml2',
'openssl',
'zlib',
]]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
class AssertPythonMysql(AssertSoftwareMixin): class AssertPythonMysql(AssertSoftwareMixin):
......
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