List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:February 20 2012 1:28pm
Subject:bzr push into mysql-trunk branch (tor.didriksen:3930 to 3931) WL#6008
View as plain text  
 3931 Tor Didriksen	2012-02-20
      WL#6008 : Replace custom encryption code with approved
      
      Post-push fix for link failure:
      /usr/bin/ld: ../extra/yassl/libyassl.a(ssl.cpp.o): 
      relocation R_X86_64_PC32 against 
      `vtable for TaoCrypt::HASH' can not be used when making a shared object; 
      recompile with -fPIC
      
      We *do* compile with -fPIC.
      The problem was different visibility of symbols.

    modified:
      libmysql/CMakeLists.txt
 3930 Vasil Dimov	2012-02-20
      Adjust main.innodb_ignore_builtin test after we started to ignore that
      option in vasil.dimov@stripped

    modified:
      mysql-test/r/innodb_ignore_builtin.result
      mysql-test/t/innodb_ignore_builtin.test
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2012-02-17 10:30:31 +0000
+++ b/libmysql/CMakeLists.txt	2012-02-20 13:27:26 +0000
@@ -150,6 +150,17 @@ SET(CLIENT_SOURCES
   ../sql/password.c
   ../sql/my_rnd.cc
 )
+
+# We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere.
+# In order to get correct symbol visibility, md5.cc and sha1.cc
+# must be compiled with "-fvisibility=hidden"
+IF(HAVE_VISIBILITY_HIDDEN)
+  SET_SOURCE_FILES_PROPERTIES(../sql/md5.cc
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+  SET_SOURCE_FILES_PROPERTIES(../sql/sha1.cc
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+ENDIF()
+
 ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})
 DTRACE_INSTRUMENT(clientlib)
 ADD_DEPENDENCIES(clientlib GenError)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3930 to 3931) WL#6008Tor Didriksen20 Feb