Commit 291b9f5e authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

use our own ncurses in varnish-2.1.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40604 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 97b76112
...@@ -7,6 +7,7 @@ parts = ...@@ -7,6 +7,7 @@ parts =
varnish-2.1 varnish-2.1
extends = extends =
../software-profiles/ncurses.cfg
../software-profiles/pcre.cfg ../software-profiles/pcre.cfg
../software-profiles/patch.cfg ../software-profiles/patch.cfg
...@@ -38,3 +39,5 @@ patches = ...@@ -38,3 +39,5 @@ patches =
environment = environment =
PATH=${patch:location}/bin:%(PATH)s PATH=${patch:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
CPPFLAGS =-I${ncurses:location}/include
LDFLAGS =-Wl,-rpath -Wl,${ncurses:location}/lib
...@@ -1800,6 +1800,47 @@ class AssertW3m(AssertSoftwareMixin): ...@@ -1800,6 +1800,47 @@ class AssertW3m(AssertSoftwareMixin):
]] ]]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
class AssertVarnish(AssertSoftwareMixin):
def test_ld_varnishd(self):
elf_dict = readElfAsDict('parts/varnish-2.1/sbin/varnishd')
self.assertEqual(sorted([
'libc',
'libdl',
'libm',
'libnsl',
'libpthread',
'libvarnish',
'libvarnishcompat',
'libvcl',
]),
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 [
'ncurses',
'varnish-2.1',
]]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
def test_ld_varnishtop(self):
elf_dict = readElfAsDict('parts/varnish-2.1/bin/varnishtop')
self.assertEqual(sorted([
'libc',
'libncurses',
'libpthread',
'libvarnish',
'libvarnishapi',
'libvarnishcompat',
]),
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 [
'ncurses',
'varnish-2.1',
]]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
class AssertElfLinkedInternally(AssertSoftwareMixin): class AssertElfLinkedInternally(AssertSoftwareMixin):
def test(self): def test(self):
return return
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment