[Commits] Rev 3660: MDEV-4183: Export additional symbols from RPMs , compatibly to distribution RPMs. in file:///H:/bzr/5.5/

Vladislav Vaintroub wlad at montyprogram.com
Mon Feb 18 21:35:31 EET 2013


At file:///H:/bzr/5.5/

------------------------------------------------------------
revno: 3660
revision-id: wlad at montyprogram.com-20130218193511-zwi6r8i9qdo24ipo
parent: sergii at pisem.net-20130208212406-zn6yzvkvaplr5df8
fixes bug: https://mariadb.atlassian.net/browse/MDEV-4183
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.5
timestamp: Mon 2013-02-18 20:35:11 +0100
message:
  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.
-------------- next part --------------
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2013-02-04 14:43:26 +0000
+++ b/libmysql/CMakeLists.txt	2013-02-18 19:35:11 +0000
@@ -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)

=== modified file 'libmysql/libmysql_rpm_version.in'
--- a/libmysql/libmysql_rpm_version.in	2013-02-04 14:43:26 +0000
+++ b/libmysql/libmysql_rpm_version.in	2013-02-18 19:35:11 +0000
@@ -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



More information about the commits mailing list