diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-08-04 19:23:17 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-08-04 19:23:17 -0400 |
| commit | b0ef30fe27f707ab0b55e35cb8934fa1bb88b945 (patch) | |
| tree | 9a698f5b94a37930d3d342617c520df8b4ec45a0 | |
| parent | Respin clientlibs for mysql 5.5.60 (diff) | |
| download | mysql-extras-b0ef30fe27f707ab0b55e35cb8934fa1bb88b945.tar.gz mysql-extras-b0ef30fe27f707ab0b55e35cb8934fa1bb88b945.tar.bz2 mysql-extras-b0ef30fe27f707ab0b55e35cb8934fa1bb88b945.zip | |
Fix tests on 5.6 for clientlibsmysql-extras-20180804-2323Z
| -rw-r--r-- | 20018_all_mysql-5.6.25-without-clientlibs-tools.patch | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/20018_all_mysql-5.6.25-without-clientlibs-tools.patch b/20018_all_mysql-5.6.25-without-clientlibs-tools.patch index 35e60de..3ae9551 100644 --- a/20018_all_mysql-5.6.25-without-clientlibs-tools.patch +++ b/20018_all_mysql-5.6.25-without-clientlibs-tools.patch @@ -52,33 +52,26 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt ---- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400 -+++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400 -@@ -59,15 +59,16 @@ - ADD_DEPENDENCIES(GenError copy_openssl_extra) +--- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400 ++++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400 +@@ -60,11 +60,16 @@ ENDIF() -+IF(NOT WITHOUT_CLIENTLIBS) -+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) -+ SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) --MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) --TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) --SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -- --MYSQL_ADD_EXECUTABLE(perror perror.c) --ADD_DEPENDENCIES(perror GenError) --TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) --SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX) -+ MYSQL_ADD_EXECUTABLE(perror perror.c) -+ ADD_DEPENDENCIES(perror GenError) -+ TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) -+ SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX) ++IF(NOT WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++MYSQL_ADD_EXECUTABLE(perror perror.c) ++ELSE(NOT WITHOUT_CLIENTLIBS) ++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++ADD_EXECUTABLE(perror perror.c) +ENDIF(NOT WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) + SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) - MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) - TARGET_LINK_LIBRARIES(resolveip mysys mysys_ssl) +-MYSQL_ADD_EXECUTABLE(perror perror.c) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) + SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX) diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt --- a/libmysql/CMakeLists.txt 2015-07-09 09:04:01.217091000 -0400 +++ b/libmysql/CMakeLists.txt 2015-07-09 09:22:47.903091000 -0400 |