[Erp5-report] r40673 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Nov 25 12:09:21 CET 2010
Author: kazuhiko
Date: Thu Nov 25 12:09:19 2010
New Revision: 40673
URL: http://svn.erp5.org?rev=40673&view=rev
Log:
* use our own ncurses on legacy varnish.
* improve tests.
Modified:
erp5/trunk/buildout/software-profiles/varnish.cfg
erp5/trunk/buildout/tests/assertSoftware.py
Modified: erp5/trunk/buildout/software-profiles/varnish.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/varnish.cfg?rev=40673&r1=40672&r2=40673&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/varnish.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/varnish.cfg [utf8] Thu Nov 25 12:09:19 2010
@@ -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 =
Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40673&r1=40672&r2=40673&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Nov 25 12:09:19 2010
@@ -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', [
More information about the Erp5-report
mailing list