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

[nobody at svn.erp5.org]

Author: luke
Date: Mon Nov 15 18:22:49 2010
New Revision: 40283

URL: http://svn.erp5.org?rev=40283&view=rev
Log:
 - compile apache against locally provided libuuid
 - extend test

Added:
    erp5/trunk/buildout/software-profiles/libuuid.cfg
Modified:
    erp5/trunk/buildout/software-profiles/apache.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/apache.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/apache.cfg?rev=40283&r1=40282&r2=40283&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/apache.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/apache.cfg [utf8] Mon Nov 15 18:22:49 2010
@@ -2,6 +2,7 @@
 parts = apache
 
 extends =
+  ../software-profiles/libuuid.cfg
   ../software-profiles/openssl.cfg
   ../software-profiles/zlib.cfg
 
@@ -39,4 +40,5 @@ configure-options = --enable-authn-alias
                     --with-z=${zlib:location}
 
 environment =
-  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib
+  CFLAGS =-I${libuuid:location}/include
+  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib

Added: erp5/trunk/buildout/software-profiles/libuuid.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/libuuid.cfg?rev=40283&view=auto
==============================================================================
--- erp5/trunk/buildout/software-profiles/libuuid.cfg (added)
+++ erp5/trunk/buildout/software-profiles/libuuid.cfg [utf8] Mon Nov 15 18:22:49 2010
@@ -0,0 +1,28 @@
+[buildout]
+parts =
+  libuuid
+
+[libuuid]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/util-linux-ng-2.18.tar.bz2
+md5sum = 2f5f71e6af969d041d73ab778c141a77
+configure-options =
+  --disable-mount
+  --disable-fsck
+  --enable-libuuid
+  --disable-uuidd
+  --disable-libblkid
+  --disable-libmount
+  --disable-nls
+  --disable-agetty
+  --disable-cramfs
+  --disable-switch_root
+  --disable-pivot_root
+  --disable-fallocate
+  --disable-unshare
+  --disable-rename
+  --disable-schedutils
+  --disable-wall
+  --disable-require-password
+  --disable-makeinstall-chown
+  --disable-makeinstall-setuid

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40283&r1=40282&r2=40283&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Mon Nov 15 18:22:49 2010
@@ -322,21 +322,21 @@ class AssertApache(unittest.TestCase):
     """Checks proper linking of libaprutil-1.so"""
     elf_dict = readElfAsDict('parts/apache/lib/libaprutil-1.so')
     self.assertEqual(sorted(['libexpat', 'libapr-1', 'librt', 'libcrypt',
-      'libpthread', 'libdl', 'libc']), elf_dict['library_list'])
+      'libpthread', 'libdl', 'libc', 'libuuid']), 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', 'zlib', 'openssl']]
+        software in ['apache', 'zlib', 'openssl', 'libuuid']]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
   def test_ld_libapr1(self):
     """Checks proper linking of libapr-1.so"""
     elf_dict = readElfAsDict('parts/apache/lib/libapr-1.so')
-    self.assertEqual(sorted(['librt', 'libcrypt',
+    self.assertEqual(sorted(['librt', 'libcrypt', 'libuuid',
       'libpthread', 'libdl', 'libc']), 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 ['zlib', 'openssl', 'libuuid']]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])