Commit 25da03c0 authored by Łukasz Nowak's avatar Łukasz Nowak

- compile apache against locally provided libuuid

 - extend test


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40283 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 304ea7aa
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
parts = apache parts = apache
extends = extends =
../software-profiles/libuuid.cfg
../software-profiles/openssl.cfg ../software-profiles/openssl.cfg
../software-profiles/zlib.cfg ../software-profiles/zlib.cfg
...@@ -39,4 +40,5 @@ configure-options = --enable-authn-alias ...@@ -39,4 +40,5 @@ configure-options = --enable-authn-alias
--with-z=${zlib:location} --with-z=${zlib:location}
environment = 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
[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
...@@ -322,21 +322,21 @@ class AssertApache(unittest.TestCase): ...@@ -322,21 +322,21 @@ class AssertApache(unittest.TestCase):
"""Checks proper linking of libaprutil-1.so""" """Checks proper linking of libaprutil-1.so"""
elf_dict = readElfAsDict('parts/apache/lib/libaprutil-1.so') elf_dict = readElfAsDict('parts/apache/lib/libaprutil-1.so')
self.assertEqual(sorted(['libexpat', 'libapr-1', 'librt', 'libcrypt', 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') soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for 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['rpath_list'])
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
def test_ld_libapr1(self): def test_ld_libapr1(self):
"""Checks proper linking of libapr-1.so""" """Checks proper linking of libapr-1.so"""
elf_dict = readElfAsDict('parts/apache/lib/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']) 'libpthread', 'libdl', 'libc']), elf_dict['library_list'])
soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts') soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for 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['rpath_list'])
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment