[Erp5-report] r40514 luke - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: luke
Date: Tue Nov 23 10:34:08 2010
New Revision: 40514

URL: http://svn.erp5.org?rev=40514&view=rev
Log:
 - do not use gssapi
 - force libxml2, disallow expat
 - force posix threads in ssl
 - add libpthread
 - make assertion lists diff friendly

Modified:
    erp5/trunk/buildout/software-profiles/neon.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/neon.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/neon.cfg?rev=40514&r1=40513&r2=40514&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/neon.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/neon.cfg [utf8] Tue Nov 23 10:34:08 2010
@@ -13,6 +13,10 @@ md5sum = ff369e69ef0f0143beb5626164e87ae
 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

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40514&r1=40513&r2=40514&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Tue Nov 23 10:34:08 2010
@@ -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):