diff --git a/buildout/software-profiles/apache.cfg b/buildout/software-profiles/apache.cfg index a5260a304e1b5fee4ee8408cd813294eb3a9da79..c6592c1b7cfc3df884082d6cfc0c7aa622e04509 100644 --- a/buildout/software-profiles/apache.cfg +++ b/buildout/software-profiles/apache.cfg @@ -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 diff --git a/buildout/software-profiles/libuuid.cfg b/buildout/software-profiles/libuuid.cfg new file mode 100644 index 0000000000000000000000000000000000000000..84e1280b5394541527fdd3ba485219d78e97912d --- /dev/null +++ b/buildout/software-profiles/libuuid.cfg @@ -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 diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 232df5516fc5ac78c44bcd70193c767b60480611..c2f6927fe558846ca6c3cb47bc2ccbc0c59d5074 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -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'])