mysql-build.patch

   1 --- mysql-5.7.9/sql/CMakeLists.txt~     2015-10-12 08:21:35.000000000 +0200
   2 +++ mysql-5.7.9/sql/CMakeLists.txt      2015-10-22 13:35:37.172783012 +0200
   3 @@ -335,7 +335,7 @@
   4    )
   5  ENDIF()
   6
   7 -ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
   8 +ADD_CONVENIENCE_LIBRARY(sql STATIC ${SQL_SOURCE})
   9  ADD_DEPENDENCIES(sql GenServerSource)
  10  ADD_DEPENDENCIES(sql GenDigestServerSource)
  11  ADD_DEPENDENCIES(sql GenBootstrapPriv)
  12 @@ -362,15 +362,15 @@
  13                     log_event.cc log_event_old.cc binlog.cc sql_binlog.cc
  14                     rpl_filter.cc rpl_record.cc rpl_record_old.cc
  15                     rpl_utility.cc rpl_injector.cc rpl_table_access.cc)
  16 -ADD_LIBRARY(binlog ${BINLOG_SOURCE})
  17 +ADD_CONVENIENCE_LIBRARY(binlog ${BINLOG_SOURCE})
  18  TARGET_LINK_LIBRARIES(binlog binlogevents_static)
  19
  20  SET (RPL_SOURCE rpl_handler.cc rpl_tblmap.cc rpl_context.cc)
  21  ADD_DEPENDENCIES(binlog GenError)
  22 -ADD_LIBRARY(rpl ${RPL_SOURCE})
  23 +ADD_CONVENIENCE_LIBRARY(rpl ${RPL_SOURCE})
  24  SET (MASTER_SOURCE rpl_master.cc rpl_binlog_sender.cc)
  25  ADD_DEPENDENCIES(rpl GenError)
  26 -ADD_LIBRARY(master ${MASTER_SOURCE})
  27 +ADD_CONVENIENCE_LIBRARY(master ${MASTER_SOURCE})
  28  ADD_DEPENDENCIES(master GenError)
  29  SET (SLAVE_SOURCE rpl_slave.cc rpl_reporting.cc rpl_mi.cc rpl_rli.cc
  30                   rpl_info_handler.cc rpl_info_file.cc
  31 @@ -379,7 +379,7 @@
  32                    rpl_rli_pdb.cc rpl_info_dummy.cc rpl_mts_submode.cc
  33                    rpl_slave_commit_order_manager.cc rpl_msr.cc
  34                    rpl_trx_boundary_parser.cc rpl_channel_service_interface.cc)
  35 -ADD_LIBRARY(slave ${SLAVE_SOURCE})
  36 +ADD_CONVENIENCE_LIBRARY(slave ${SLAVE_SOURCE})
  37  ADD_DEPENDENCIES(slave GenError)
  38
  39  ######################### GUnit Lib #################################
  40 @@ -396,7 +396,7 @@
  41    LIST(APPEND SQL_GUNIT_LIB_SOURCE named_pipe.cc)
  42  ENDIF()
  43
  44 -ADD_LIBRARY(sqlgunitlib ${SQL_GUNIT_LIB_SOURCE})
  45 +ADD_CONVENIENCE_LIBRARY(sqlgunitlib ${SQL_GUNIT_LIB_SOURCE})
  46  ADD_DEPENDENCIES(sqlgunitlib GenError)
  47
  48  ######################### GUnit Lib #################################
  49 @@ -558,7 +558,7 @@
  50
  51
  52  IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
  53 -  ADD_LIBRARY(udf_example MODULE udf_example.cc)
  54 +  ADD_CONVENIENCE_LIBRARY(udf_example MODULE udf_example.cc)
  55    SET_TARGET_PROPERTIES(udf_example PROPERTIES PREFIX "")
  56    # udf_example depends on strings
  57    IF(WIN32)