diff --git a/buildout/software-profiles/serf.cfg b/buildout/software-profiles/serf.cfg index 9aed383fc03de4faf216dc2aeb2d8071218afdef..b07b83748803bf46ec1e37ec5e7c0a1d6b4c1b2f 100644 --- a/buildout/software-profiles/serf.cfg +++ b/buildout/software-profiles/serf.cfg @@ -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 diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 4df627dd75a13d3519bcf6d19aacdc6c5fa0c8f5..5412444a32b264b94090aaed382347250e22fa24 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -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):