database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

don't put libmysqlclient symbols extra-used on debian

Browse Source 
in the libmysqlclient_16 version node.
This commit is contained in:
Sergei Golubchik
2014-03-25 17:34:45 +01:00
parent 21a17536c6
commit cb0a661cd7
1 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
libmysql/CMakeLists.txt
View File

@@ -262,7 +262,35 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
mysql_get_charset_by_csname mysql_get_charset_by_csname
mysql_net_realloc mysql_net_realloc
# And even more so on Debian, libmyodbc. Argh! # PHP's mysqli.so requires this (via the ER() macro)
mysql_client_errors
# Also export the non-renamed variants
# (in case someone wants to rebuild mysqli-php or something similar)
# See MDEV-4127
default_charset_info
get_charset
get_charset_by_csname
net_realloc
client_errors
# pure-ftpd requires this
my_make_scrambled_password
# hydra requires this
scramble
# ODB requires this: https://bugzilla.redhat.com/show_bug.cgi?id=846602
THR_KEY_mysys
# DBD::mysql requires this
is_prefix
)
# And even more so on Debian
SET(CLIENT_API_5_5_EXTRA
# libmyodbc. Argh!
alloc_dynamic alloc_dynamic
alloc_root alloc_root
delete_dynamic delete_dynamic
@@ -292,33 +320,9 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
strmake_root strmake_root
strxmov strxmov
# PHP's mysqli.so requires this (via the ER() macro) # pam_mysql.so
mysql_client_errors
# Also export the non-renamed variants
# (in case someone wants to rebuild mysqli-php or something similar)
# See MDEV-4127
default_charset_info
get_charset
get_charset_by_csname
net_realloc
client_errors
# pure-ftpd requires this
my_make_scrambled_password
# pam_mysql.so on Debian
make_scrambled_password make_scrambled_password
make_scrambled_password_323 make_scrambled_password_323
# hydra requires this
scramble
# ODB requires this: https://bugzilla.redhat.com/show_bug.cgi?id=846602
THR_KEY_mysys
# DBD::mysql requires this
is_prefix
) )
# Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529 # Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529
@@ -337,7 +341,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
ENDFOREACH() ENDFOREACH()
SET (CLIENT_API_5_5_LIST) SET (CLIENT_API_5_5_LIST)
FOREACH (f ${CLIENT_API_FUNCTIONS_5_5}) FOREACH (f ${CLIENT_API_FUNCTIONS_5_5} ${CLIENT_API_5_5_EXTRA})
SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n") SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n")
ENDFOREACH() ENDFOREACH()
@@ -398,7 +402,9 @@ IF(UNIX)
ENDIF() ENDIF()
IF(NOT DISABLE_SHARED) IF(NOT DISABLE_SHARED)
MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} COMPONENT SharedLibraries) MERGE_LIBRARIES(libmysql SHARED ${LIBS}
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
COMPONENT SharedLibraries)
IF(UNIX) IF(UNIX)
# libtool compatability # libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)