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

[nobody at svn.erp5.org]

Author: luke
Date: Wed Nov 17 11:06:33 2010
New Revision: 40323

URL: http://svn.erp5.org?rev=40323&view=rev
Log:
 - use locally available libuuid
 - update tests for serf to assert local zlib and libuuid

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

Modified: erp5/trunk/buildout/software-profiles/serf.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/serf.cfg?rev=40323&r1=40322&r2=40323&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/serf.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/serf.cfg [utf8] Wed Nov 17 11:06:33 2010
@@ -3,6 +3,7 @@ parts =
   serf
 extends =
   ../software-profiles/apache.cfg
+  ../software-profiles/libuuid.cfg
   ../software-profiles/openssl.cfg
   ../software-profiles/zlib.cfg
 
@@ -15,5 +16,5 @@ configure-options =
   --with-apr-util=${apache:location}/bin/apu-1-config
   --with-openssl=${openssl:location}
 environment =
-  CFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40323&r1=40322&r2=40323&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Wed Nov 17 11:06:33 2010
@@ -341,7 +341,7 @@ class AssertSerf(AssertSoftwareMixin):
         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', 'openssl', 'libexpat']]
+        software in ['apache', 'openssl', 'libexpat', 'libuuid', 'zlib']]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
 class AssertPythonMysql(AssertSoftwareMixin):