From 180c6adfdce693ba90403bef324eb3ee0a811377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Wed, 17 Nov 2010 10:06:33 +0000 Subject: [PATCH] - use locally available libuuid - update tests for serf to assert local zlib and libuuid git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40323 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/serf.cfg | 5 +++-- buildout/tests/assertSoftware.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/buildout/software-profiles/serf.cfg b/buildout/software-profiles/serf.cfg index 9aed383fc0..b07b837488 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 4df627dd75..5412444a32 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): -- 2.30.9