From 85396b40ffe86d30b6741445bda648416db3fbde Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 25 Nov 2010 11:09:19 +0000 Subject: [PATCH] * use our own ncurses on legacy varnish. * improve tests. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40673 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/varnish.cfg | 5 +-- buildout/tests/assertSoftware.py | 44 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/buildout/software-profiles/varnish.cfg b/buildout/software-profiles/varnish.cfg index e678c18d4c..e2b5e972d1 100644 --- a/buildout/software-profiles/varnish.cfg +++ b/buildout/software-profiles/varnish.cfg @@ -18,6 +18,9 @@ extends = recipe = hexagonit.recipe.cmmi url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download md5sum = d91dc21c636db61c69b5e8f061c5bb95 +environment = + CPPFLAGS =-I${ncurses:location}/include + LDFLAGS =-Wl,-rpath -Wl,${ncurses:location}/lib # http://www.varnish-cache.org/trac/ticket/801 [varnish-2.1.4-r5467-patch] @@ -32,8 +35,6 @@ recipe = hexagonit.recipe.cmmi url = http://www.varnish-software.com/sites/default/files/varnish-2.1.4.tar.gz md5sum = e794a37b6fbb786a083c0946103ae103 patch-options = -p4 -configure-options = - --with-pcre-config=${pcre:location}/bin patches = ${varnish-2.1.4-r5467-patch:location}/${varnish-2.1.4-r5467-patch:filename} environment = diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 3ce867fa2c..a08a5522fe 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -1409,6 +1409,19 @@ class AssertW3m(AssertSoftwareMixin): class AssertVarnish(AssertSoftwareMixin): def test_ld_varnishd(self): + self.assertLibraryList('parts/varnish/sbin/varnishd', [ + 'libc', + 'libdl', + 'libm', + 'libnsl', + 'libpthread', + 'libvarnish', + 'libvarnishcompat', + 'libvcl', + ], [ + 'ncurses', + 'varnish', + ]) self.assertLibraryList('parts/varnish-2.1/sbin/varnishd', [ 'libc', 'libdl', @@ -1424,6 +1437,17 @@ class AssertVarnish(AssertSoftwareMixin): ]) def test_ld_varnishtop(self): + self.assertLibraryList('parts/varnish/bin/varnishtop', [ + 'libc', + 'libncurses', + 'libpthread', + 'libvarnish', + 'libvarnishapi', + 'libvarnishcompat', + ], [ + 'ncurses', + 'varnish', + ]) self.assertLibraryList('parts/varnish-2.1/bin/varnishtop', [ 'libc', 'libncurses', @@ -1436,6 +1460,26 @@ class AssertVarnish(AssertSoftwareMixin): 'varnish-2.1', ]) + def test_ld_libvarnish(self): + self.assertLibraryList('parts/varnish/lib/libvarnish.so', [ + 'libc', + 'libm', + 'libnsl', + 'librt', + ], [ + 'ncurses', + ]) + self.assertLibraryList('parts/varnish-2.1/lib/libvarnish.so', [ + 'libc', + 'libm', + 'libnsl', + 'libpcre', + 'librt', + ], [ + 'ncurses', + 'pcre', + ]) + class AssertLibrsync(AssertSoftwareMixin): def test_ld_rdiff(self): self.assertLibraryList('parts/librsync/bin/rdiff', [ -- 2.30.9