diff options
| author |   Brian Evans <grknight@gentoo.org> | 2019-01-20 13:22:22 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2019-01-20 13:22:22 -0500 |
| commit | 90f5dcf89b9f9781de9a3ee1dabaf741c580c619 (patch) | |
| tree | 770b8418d6b2d61a92237f3cca9c32b15919321e | |
| parent | Fix syntax error (diff) | |
| download | mysql-extras-90f5dcf89b9f9781de9a3ee1dabaf741c580c619.tar.gz mysql-extras-90f5dcf89b9f9781de9a3ee1dabaf741c580c619.tar.bz2 mysql-extras-90f5dcf89b9f9781de9a3ee1dabaf741c580c619.zip | |
Respin clientlibs patch for cluster 7.2
Signed-off-by: Brian Evans <grknight@gentoo.org>
| -rw-r--r-- | 20018_all_mysql-cluster-7.2.34-without-clientlibs-tools.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/20018_all_mysql-cluster-7.2.34-without-clientlibs-tools.patch b/20018_all_mysql-cluster-7.2.34-without-clientlibs-tools.patch new file mode 100644 index 0000000..e5ddff3 --- /dev/null +++ b/20018_all_mysql-cluster-7.2.34-without-clientlibs-tools.patch @@ -0,0 +1,78 @@ +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 ++++ b/CMakeLists.txt 2015-06-24 10:34:17.314169100 -0400 +@@ -404,7 +404,9 @@ + CONFIGURE_PLUGINS() + ENDIF() + +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + ADD_SUBDIRECTORY(dbug) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) +diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt +--- a/extra/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 ++++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400 +@@ -54,10 +54,15 @@ + DEPENDS + ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) + ++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) + +-MYSQL_ADD_EXECUTABLE(perror perror.c) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys) + +diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +--- a/scripts/CMakeLists.txt 2015-06-24 10:28:12.800169100 -0400 ++++ b/scripts/CMakeLists.txt 2015-06-24 10:42:49.682169100 -0400 +@@ -327,7 +327,6 @@ + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config + mysql_fix_extensions + mysql_setpermission + mysql_secure_installation +@@ -341,6 +340,12 @@ + mysqld_multi + mysqld_safe + ) ++ IF(NOT WITHOUT_CLIENTLIBS) ++ SET(BIN_SCRIPTS ++ ${BIN_SCRIPTS} ++ mysql_config ++ ) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) + FOREACH(file ${BIN_SCRIPTS}) + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh +diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +--- a/libmysql/CMakeLists.txt 2015-06-24 12:32:11.606169100 -0400 ++++ b/libmysql/CMakeLists.txt 2015-06-24 13:44:53.857169100 -0400 +@@ -202,14 +202,14 @@ + + IF(UNIX) + GET_TARGET_NAME(mysqlclient lib_name) +- IF(ENABLE_STATIC_LIBS) ++ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS) + INSTALL_SYMLINK(mysqlclient + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a + ${INSTALL_LIBDIR} Development) + ENDIF() + ENDIF() + +-IF(NOT DISABLE_SHARED) ++IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} + COMPONENT SharedLibraries) |