From fc5c26667ba8cafcf0f8650e1044e0560113eed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Tue, 23 Nov 2010 09:34:08 +0000 Subject: [PATCH] - 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 --- buildout/software-profiles/neon.cfg | 4 ++++ buildout/tests/assertSoftware.py | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/buildout/software-profiles/neon.cfg b/buildout/software-profiles/neon.cfg index 15a9d09223..2d00a3887f 100644 --- a/buildout/software-profiles/neon.cfg +++ b/buildout/software-profiles/neon.cfg @@ -13,6 +13,10 @@ md5sum = ff369e69ef0f0143beb5626164e87ae2 configure-options = --enable-shared --with-ssl=openssl + --without-expat + --without-gssapi + --with-libxml2 + --enable-threadsafe-ssl=posix environment = PATH=${libxml2:location}/bin:%(PATH)s CPPFLAGS=-I${openssl:location}/include -I{zlib:location}/include diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 4b941aed9e..056869e390 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -795,12 +795,23 @@ class AssertNeon(AssertSoftwareMixin): def test_ld_libneon(self): elf_dict = readElfAsDict('parts/neon/lib/libneon.so') self.assertEqual(sorted([ - 'libc', 'libcrypto', 'libxml2', 'libdl', 'libm', 'libssl', 'libz', + 'libc', + 'libcrypto', + 'libdl', + 'libm', + 'libpthread', + 'libssl', + 'libxml2', + 'libz', ]), 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 ['openssl', 'libxml2', 'zlib']] + software in [ + 'libxml2', + 'openssl', + 'zlib', + ]] self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) class AssertPythonMysql(AssertSoftwareMixin): -- 2.30.9