1 |
commit: 1d80ca492bb85a92377fb00588b4e9e8ac28bc57 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 20 23:09:59 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 20 23:09:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=1d80ca49 |
7 |
|
8 |
Respin clientlibs for cluster 7.3.22 |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
11 |
|
12 |
...l-cluster-7.3.22-without-clientlibs-tools.patch | 100 +++++++++++++++++++++ |
13 |
1 file changed, 100 insertions(+) |
14 |
|
15 |
diff --git a/20018_all_mysql-cluster-7.3.22-without-clientlibs-tools.patch b/20018_all_mysql-cluster-7.3.22-without-clientlibs-tools.patch |
16 |
new file mode 100644 |
17 |
index 0000000..5ca164e |
18 |
--- /dev/null |
19 |
+++ b/20018_all_mysql-cluster-7.3.22-without-clientlibs-tools.patch |
20 |
@@ -0,0 +1,100 @@ |
21 |
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt |
22 |
+--- a/CMakeLists.txt 2015-07-09 09:04:00.118091000 -0400 |
23 |
++++ b/CMakeLists.txt 2015-07-09 09:17:06.291091000 -0400 |
24 |
+@@ -436,7 +434,10 @@ |
25 |
+ ADD_SUBDIRECTORY(storage/ndb) |
26 |
+ ENDIF() |
27 |
+ |
28 |
+-ADD_SUBDIRECTORY(include) |
29 |
++IF(NOT WITHOUT_CLIENTLIBS) |
30 |
++ ADD_SUBDIRECTORY(include) |
31 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
32 |
++ |
33 |
+ ADD_SUBDIRECTORY(dbug) |
34 |
+ ADD_SUBDIRECTORY(strings) |
35 |
+ ADD_SUBDIRECTORY(vio) |
36 |
+@@ -462,7 +463,6 @@ |
37 |
+ ENDIF() |
38 |
+ |
39 |
+ ADD_SUBDIRECTORY(extra) |
40 |
+-ADD_SUBDIRECTORY(client) |
41 |
+ ADD_SUBDIRECTORY(sql/share) |
42 |
+ ADD_SUBDIRECTORY(libservices) |
43 |
+ |
44 |
+@@ -470,7 +470,11 @@ |
45 |
+ ADD_SUBDIRECTORY(man) |
46 |
+ ENDIF() |
47 |
+ |
48 |
++IF(NOT WITHOUT_TOOLS) |
49 |
++ ADD_SUBDIRECTORY(client) |
50 |
++ENDIF(NOT WITHOUT_TOOLS) |
51 |
++ |
52 |
+ IF(NOT WITHOUT_SERVER) |
53 |
+ ADD_SUBDIRECTORY(tests) |
54 |
+ ADD_SUBDIRECTORY(sql) |
55 |
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) |
56 |
+diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt |
57 |
+--- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400 |
58 |
++++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400 |
59 |
+@@ -60,11 +60,16 @@ |
60 |
+ ENDIF() |
61 |
+ |
62 |
+ |
63 |
++IF(NOT WITHOUT_CLIENTLIBS) |
64 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) |
65 |
++MYSQL_ADD_EXECUTABLE(perror perror.c) |
66 |
++ELSE(NOT WITHOUT_CLIENTLIBS) |
67 |
++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) |
68 |
++ADD_EXECUTABLE(perror perror.c) |
69 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
70 |
+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) |
71 |
+ SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) |
72 |
+ |
73 |
+-MYSQL_ADD_EXECUTABLE(perror perror.c) |
74 |
+ ADD_DEPENDENCIES(perror GenError) |
75 |
+ TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) |
76 |
+ SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX) |
77 |
+diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt |
78 |
+--- a/libmysql/CMakeLists.txt 2015-07-09 09:04:01.217091000 -0400 |
79 |
++++ b/libmysql/CMakeLists.txt 2015-07-09 09:22:47.903091000 -0400 |
80 |
+@@ -217,14 +217,14 @@ |
81 |
+ |
82 |
+ IF(UNIX) |
83 |
+ GET_TARGET_NAME(mysqlclient lib_name) |
84 |
+- IF(ENABLE_STATIC_LIBS) |
85 |
++ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS) |
86 |
+ INSTALL_SYMLINK(mysqlclient |
87 |
+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a |
88 |
+ ${INSTALL_LIBDIR} Development) |
89 |
+ ENDIF() |
90 |
+ ENDIF() |
91 |
+ |
92 |
+-IF(NOT DISABLE_SHARED) |
93 |
++IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS) |
94 |
+ # Merge several convenience libraries into one big mysqlclient |
95 |
+ # and link them together into shared library. |
96 |
+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} |
97 |
+diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt |
98 |
+--- a/scripts/CMakeLists.txt 2015-07-09 09:04:00.401091000 -0400 |
99 |
++++ b/scripts/CMakeLists.txt 2015-07-09 09:20:25.723091000 -0400 |
100 |
+@@ -347,7 +347,6 @@ |
101 |
+ SET(mysql_config_COMPONENT COMPONENT Development) |
102 |
+ SET(BIN_SCRIPTS |
103 |
+ msql2mysql |
104 |
+- mysql_config |
105 |
+ mysql_fix_extensions |
106 |
+ mysql_setpermission |
107 |
+ mysql_zap |
108 |
+@@ -360,6 +359,12 @@ |
109 |
+ mysqld_multi |
110 |
+ mysqld_safe |
111 |
+ ) |
112 |
++ IF(NOT WITHOUT_CLIENTLIBS) |
113 |
++ SET(BIN_SCRIPTS |
114 |
++ ${BIN_SCRIPTS} |
115 |
++ mysql_config |
116 |
++ ) |
117 |
++ ENDIF(NOT WITHOUT_CLIENTLIBS) |
118 |
+ FOREACH(file ${BIN_SCRIPTS}) |
119 |
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) |
120 |
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh |