Commit 0995ab2e authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-4183: Export additional symbols from RPMs , compatibly to distribution RPMs.

-Ensure that symbols listed in CLIENT_API_EXTRA are not thrown away by the linker.
-Add THR_KEY_mysys to this list, because Fedora18 exports it.
parent 99bc6b92
...@@ -257,10 +257,12 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ...@@ -257,10 +257,12 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
get_charset get_charset
get_charset_by_csname get_charset_by_csname
net_realloc net_realloc
client_errors) client_errors
THR_key_mysys
)
# Add special script to fix symbols renames by Fedora # Add special script to fix symbols renames by Fedora
SET(CLIENT_SOURCES_EXTRA ${CLIENT_SOURCES} rpm_support.cc) SET(CLIENT_SOURCES_EXTRA rpm_support.cc)
SET(VERSION_SCRIPT_TEMPLATE SET(VERSION_SCRIPT_TEMPLATE
${CMAKE_CURRENT_SOURCE_DIR}/libmysql_rpm_version.in) ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_rpm_version.in)
ELSEIF(DEB) ELSEIF(DEB)
...@@ -349,7 +351,7 @@ IF(UNIX) ...@@ -349,7 +351,7 @@ IF(UNIX)
ENDIF() ENDIF()
IF(NOT DISABLE_SHARED) IF(NOT DISABLE_SHARED)
MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_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)
......
...@@ -21,6 +21,8 @@ libmysqlclient_16 { ...@@ -21,6 +21,8 @@ libmysqlclient_16 {
my_print_help; my_print_help;
# pure-ftpd requires this # pure-ftpd requires this
my_make_scrambled_password; my_make_scrambled_password;
# fedora18 export
THR_KEY_mysys;
# hydra requires this # hydra requires this
scramble; scramble;
# DBD::mysql requires this # DBD::mysql requires this
......
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