Commit 31a0b946 authored by Nicolas Dumazet's avatar Nicolas Dumazet

mysql links against libstdc++


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42244 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e96c7cc0
......@@ -435,10 +435,10 @@ class AssertMariadb(AssertSoftwareMixin):
'libpthread', 'librt', 'libstdc++', 'libz'], ['ncurses', 'zlib', 'readline'])
def test_ld_libmysqlclient_r(self):
self.assertLibraryList('parts/mariadb/lib/mysql/libmysqlclient_r.so', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread'], ['ncurses', 'zlib', 'readline'])
self.assertLibraryList('parts/mariadb/lib/mysql/libmysqlclient_r.so', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread', 'libstdc++'], ['ncurses', 'zlib', 'readline'])
def test_ld_libmysqlclient(self):
self.assertLibraryList('parts/mariadb/lib/mysql/libmysqlclient.so', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread'], ['ncurses', 'readline', 'zlib'])
self.assertLibraryList('parts/mariadb/lib/mysql/libmysqlclient.so', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libnsl', 'libpthread', 'libstdc++'], ['ncurses', 'readline', 'zlib'])
def test_ld_mysql(self):
self.assertLibraryList('parts/mariadb/bin/mysql', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libgcc_s', 'libm',
......@@ -455,7 +455,7 @@ class AssertMariadb(AssertSoftwareMixin):
def test_ld_mysqldump(self):
self.assertLibraryList('parts/mariadb/bin/mysqldump', ['libc', 'libdl', 'librt', 'libz', 'libcrypt', 'libm', 'libmysqlclient',
'libnsl', 'libpthread'], ['ncurses', 'zlib', 'readline'],
'libnsl', 'libpthread', 'libstdc++'], ['ncurses', 'zlib', 'readline'],
[os.path.join(os.path.abspath(os.curdir),
'parts', 'mariadb', 'lib', 'mysql')])
......
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