Commit 08343ff6 authored by Łukasz Nowak's avatar Łukasz Nowak

- core and usual list is different


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40676 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 13ef17e6
...@@ -1599,7 +1599,7 @@ class AssertFile(AssertSoftwareMixin): ...@@ -1599,7 +1599,7 @@ class AssertFile(AssertSoftwareMixin):
]) ])
class AssertImagemagick(AssertSoftwareMixin): class AssertImagemagick(AssertSoftwareMixin):
lib_lib_list = [ core_lib_list = [
'libbz2', 'libbz2',
'libc', 'libc',
'libdl', 'libdl',
...@@ -1608,14 +1608,22 @@ class AssertImagemagick(AssertSoftwareMixin): ...@@ -1608,14 +1608,22 @@ class AssertImagemagick(AssertSoftwareMixin):
'libz', 'libz',
] ]
lib_rpath_list = [ core_rpath_list = [
'zlib', 'zlib',
'bzip2', 'bzip2',
] ]
lib_lib_list = core_lib_list + [
'libMagickCore',
]
lib_rpath_list = core_lib_list + [
'imagemagick',
]
def test_ld_libMagickCore(self): def test_ld_libMagickCore(self):
self.assertLibraryList('parts/imagemagick/lib/libMagickCore.so', self.assertLibraryList('parts/imagemagick/lib/libMagickCore.so',
self.lib_lib_list, self.lib_rpath_list) self.core_lib_list, self.core_rpath_list)
def test_ld_libMagickWand(self): def test_ld_libMagickWand(self):
self.assertLibraryList('parts/imagemagick/lib/libMagickWand.so', self.assertLibraryList('parts/imagemagick/lib/libMagickWand.so',
......
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