| 1 |
commit: 90f5dcf89b9f9781de9a3ee1dabaf741c580c619 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 20 18:22:22 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 20 18:22:22 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=90f5dcf8 |
| 7 |
|
| 8 |
Respin clientlibs patch for cluster 7.2 |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
...l-cluster-7.2.34-without-clientlibs-tools.patch | 78 ++++++++++++++++++++++ |
| 13 |
1 file changed, 78 insertions(+) |
| 14 |
|
| 15 |
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 |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..e5ddff3 |
| 18 |
--- /dev/null |
| 19 |
+++ b/20018_all_mysql-cluster-7.2.34-without-clientlibs-tools.patch |
| 20 |
@@ -0,0 +1,78 @@ |
| 21 |
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt |
| 22 |
+--- a/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 |
| 23 |
++++ b/CMakeLists.txt 2015-06-24 10:34:17.314169100 -0400 |
| 24 |
+@@ -404,7 +404,9 @@ |
| 25 |
+ CONFIGURE_PLUGINS() |
| 26 |
+ ENDIF() |
| 27 |
+ |
| 28 |
+-ADD_SUBDIRECTORY(include) |
| 29 |
++IF(NOT WITHOUT_CLIENTLIBS) |
| 30 |
++ ADD_SUBDIRECTORY(include) |
| 31 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
| 32 |
+ ADD_SUBDIRECTORY(dbug) |
| 33 |
+ ADD_SUBDIRECTORY(strings) |
| 34 |
+ ADD_SUBDIRECTORY(vio) |
| 35 |
+diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt |
| 36 |
+--- a/extra/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 |
| 37 |
++++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400 |
| 38 |
+@@ -54,10 +54,15 @@ |
| 39 |
+ DEPENDS |
| 40 |
+ ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) |
| 41 |
+ |
| 42 |
++IF(NOT WITHOUT_CLIENTLIBS) |
| 43 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) |
| 44 |
++MYSQL_ADD_EXECUTABLE(perror perror.c) |
| 45 |
++ELSE(NOT WITHOUT_CLIENTLIBS) |
| 46 |
++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) |
| 47 |
++ADD_EXECUTABLE(perror perror.c) |
| 48 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
| 49 |
+ TARGET_LINK_LIBRARIES(my_print_defaults mysys) |
| 50 |
+ |
| 51 |
+-MYSQL_ADD_EXECUTABLE(perror perror.c) |
| 52 |
+ ADD_DEPENDENCIES(perror GenError) |
| 53 |
+ TARGET_LINK_LIBRARIES(perror mysys) |
| 54 |
+ |
| 55 |
+diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt |
| 56 |
+--- a/scripts/CMakeLists.txt 2015-06-24 10:28:12.800169100 -0400 |
| 57 |
++++ b/scripts/CMakeLists.txt 2015-06-24 10:42:49.682169100 -0400 |
| 58 |
+@@ -327,7 +327,6 @@ |
| 59 |
+ # On Unix, most of the files end up in the bin directory |
| 60 |
+ SET(BIN_SCRIPTS |
| 61 |
+ msql2mysql |
| 62 |
+- mysql_config |
| 63 |
+ mysql_fix_extensions |
| 64 |
+ mysql_setpermission |
| 65 |
+ mysql_secure_installation |
| 66 |
+@@ -341,6 +340,12 @@ |
| 67 |
+ mysqld_multi |
| 68 |
+ mysqld_safe |
| 69 |
+ ) |
| 70 |
++ IF(NOT WITHOUT_CLIENTLIBS) |
| 71 |
++ SET(BIN_SCRIPTS |
| 72 |
++ ${BIN_SCRIPTS} |
| 73 |
++ mysql_config |
| 74 |
++ ) |
| 75 |
++ ENDIF(NOT WITHOUT_CLIENTLIBS) |
| 76 |
+ FOREACH(file ${BIN_SCRIPTS}) |
| 77 |
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) |
| 78 |
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh |
| 79 |
+diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt |
| 80 |
+--- a/libmysql/CMakeLists.txt 2015-06-24 12:32:11.606169100 -0400 |
| 81 |
++++ b/libmysql/CMakeLists.txt 2015-06-24 13:44:53.857169100 -0400 |
| 82 |
+@@ -202,14 +202,14 @@ |
| 83 |
+ |
| 84 |
+ IF(UNIX) |
| 85 |
+ GET_TARGET_NAME(mysqlclient lib_name) |
| 86 |
+- IF(ENABLE_STATIC_LIBS) |
| 87 |
++ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS) |
| 88 |
+ INSTALL_SYMLINK(mysqlclient |
| 89 |
+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a |
| 90 |
+ ${INSTALL_LIBDIR} Development) |
| 91 |
+ ENDIF() |
| 92 |
+ ENDIF() |
| 93 |
+ |
| 94 |
+-IF(NOT DISABLE_SHARED) |
| 95 |
++IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS) |
| 96 |
+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} |
| 97 |
+ EXPORTS ${CLIENT_API_FUNCTIONS} |
| 98 |
+ COMPONENT SharedLibraries) |
Archives