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

[nobody at svn.erp5.org]

Author: luke
Date: Mon Nov 22 17:09:51 2010
New Revision: 40485

URL: http://svn.erp5.org?rev=40485&view=rev
Log:
 - do not use zlib in openssl

Package needs patching to be able to add locally provided zlib to
openssl.

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

Modified: erp5/trunk/buildout/software-profiles/openssl.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/openssl.cfg?rev=40485&r1=40484&r2=40485&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/openssl.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/openssl.cfg [utf8] Mon Nov 22 17:09:51 2010
@@ -18,7 +18,7 @@ configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --libdir=lib
   shared
-  zlib
+  no-zlib
 
 # it seems that parallel build sometimes fails for openssl.
 make-options =

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40485&r1=40484&r2=40485&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Mon Nov 22 17:09:51 2010
@@ -1405,11 +1405,11 @@ class AssertItools(AssertSoftwareMixin):
 class AssertOpenssl(AssertSoftwareMixin):
   def test_ld_openssl(self):
     elf_dict = readElfAsDict('parts/openssl/bin/openssl')
-    self.assertEqual(sorted(['libc', 'libcrypto', 'libdl', 'libssl', 'libz']),
+    self.assertEqual(sorted(['libc', 'libcrypto', 'libdl', 'libssl']),
         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 ['openssl']]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
 class AssertElfLinkedInternally(AssertSoftwareMixin):