diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-02-18 20:35:11 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-02-18 20:35:11 +0100 |
| commit | 0995ab2e1a04d7b133c48e666407c8044ae6edc1 (patch) | |
| tree | 60a85b10650f9ac39f4597c0976654826eaa9326 /libmysql | |
| parent | 99bc6b923ef1fe079e9ad22841a630961600317f (diff) | |
| download | mariadb-git-0995ab2e1a04d7b133c48e666407c8044ae6edc1.tar.gz | |
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.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | libmysql/libmysql_rpm_version.in | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index d23a255e1b7..7eff307764a 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -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) diff --git a/libmysql/libmysql_rpm_version.in b/libmysql/libmysql_rpm_version.in index b153b02e381..ff0707cdb75 100644 --- a/libmysql/libmysql_rpm_version.in +++ b/libmysql/libmysql_rpm_version.in @@ -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 |