mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
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.
This commit is contained in:
parent
99bc6b923e
commit
0995ab2e1a
2 changed files with 7 additions and 3 deletions
|
|
@ -257,10 +257,12 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|||
get_charset
|
||||
get_charset_by_csname
|
||||
net_realloc
|
||||
client_errors)
|
||||
client_errors
|
||||
THR_key_mysys
|
||||
)
|
||||
|
||||
# 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
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/libmysql_rpm_version.in)
|
||||
ELSEIF(DEB)
|
||||
|
|
@ -349,7 +351,7 @@ IF(UNIX)
|
|||
ENDIF()
|
||||
|
||||
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)
|
||||
# libtool compatability
|
||||
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ libmysqlclient_16 {
|
|||
my_print_help;
|
||||
# pure-ftpd requires this
|
||||
my_make_scrambled_password;
|
||||
# fedora18 export
|
||||
THR_KEY_mysys;
|
||||
# hydra requires this
|
||||
scramble;
|
||||
# DBD::mysql requires this
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue