1 |
commit: a98663207844c9e435f2c63d8a8ff81f9e042a08 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 28 16:10:53 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 28 16:10:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=a9866320 |
7 |
|
8 |
Fix patch for client-libs on 10.2/10.3 |
9 |
|
10 |
...l_mariadb-10.2.9-without-clientlibs-tools.patch | 200 +++++++++++++++++++++ |
11 |
1 file changed, 200 insertions(+) |
12 |
|
13 |
diff --git a/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch |
14 |
new file mode 100644 |
15 |
index 0000000..5919c67 |
16 |
--- /dev/null |
17 |
+++ b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch |
18 |
@@ -0,0 +1,200 @@ |
19 |
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt |
20 |
+--- a/CMakeLists.txt 2018-02-27 16:45:56.740178421 -0500 |
21 |
++++ b/CMakeLists.txt 2018-02-28 09:06:59.163673185 -0500 |
22 |
+@@ -339,8 +339,6 @@ |
23 |
+ MYSQL_CHECK_ZLIB_WITH_COMPRESS() |
24 |
+ # Add bundled yassl/taocrypt or system openssl. |
25 |
+ MYSQL_CHECK_SSL() |
26 |
+-# Add readline or libedit. |
27 |
+-MYSQL_CHECK_READLINE() |
28 |
+ |
29 |
+ SET(MALLOC_LIBRARY "system") |
30 |
+ |
31 |
+@@ -377,28 +375,38 @@ |
32 |
+ |
33 |
+ SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") |
34 |
+ |
35 |
+-INCLUDE(submodules) |
36 |
+ INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) |
37 |
+ |
38 |
+ # Add storage engines and plugins. |
39 |
+ CONFIGURE_PLUGINS() |
40 |
+ |
41 |
+-ADD_SUBDIRECTORY(include) |
42 |
++IF(NOT WITHOUT_CLIENTLIBS) |
43 |
++ ADD_SUBDIRECTORY(include) |
44 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
45 |
++ |
46 |
+ ADD_SUBDIRECTORY(dbug) |
47 |
+ ADD_SUBDIRECTORY(strings) |
48 |
+ ADD_SUBDIRECTORY(vio) |
49 |
+ ADD_SUBDIRECTORY(mysys) |
50 |
+ ADD_SUBDIRECTORY(mysys_ssl) |
51 |
+-ADD_SUBDIRECTORY(client) |
52 |
+ ADD_SUBDIRECTORY(extra) |
53 |
+ ADD_SUBDIRECTORY(libservices) |
54 |
+ ADD_SUBDIRECTORY(sql/share) |
55 |
+ |
56 |
++IF(NOT WITHOUT_TOOLS) |
57 |
++ # Add readline or libedit. |
58 |
++ MYSQL_CHECK_READLINE() |
59 |
++ ADD_SUBDIRECTORY(client) |
60 |
++ENDIF(NOT WITHOUT_TOOLS) |
61 |
++ |
62 |
+ IF(NOT WITHOUT_SERVER) |
63 |
+ ADD_SUBDIRECTORY(tests) |
64 |
+ ADD_SUBDIRECTORY(sql) |
65 |
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) |
66 |
+- IF(WITH_EMBEDDED_SERVER) |
67 |
++ IF(WITH_EMBEDDED_SERVER) |
68 |
++ IF(WITHOUT_TOOLS) |
69 |
++ MYSQL_CHECK_READLINE() |
70 |
++ ENDIF(WITHOUT_TOOLS) |
71 |
+ ADD_SUBDIRECTORY(libmysqld) |
72 |
+ ADD_SUBDIRECTORY(libmysqld/examples) |
73 |
+ ENDIF(WITH_EMBEDDED_SERVER) |
74 |
+diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt |
75 |
+--- a/extra/CMakeLists.txt 2018-02-27 16:45:56.470183732 -0500 |
76 |
++++ b/extra/CMakeLists.txt 2018-02-27 16:53:11.095621060 -0500 |
77 |
+@@ -46,12 +46,14 @@ |
78 |
+ DEPENDS |
79 |
+ ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) |
80 |
+ |
81 |
++IF(NOT WITHOUT_CLIENTLIBS) |
82 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) |
83 |
+ TARGET_LINK_LIBRARIES(my_print_defaults mysys) |
84 |
+ |
85 |
+ MYSQL_ADD_EXECUTABLE(perror perror.c) |
86 |
+ ADD_DEPENDENCIES(perror GenError) |
87 |
+ TARGET_LINK_LIBRARIES(perror mysys) |
88 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
89 |
+ |
90 |
+ IF(UNIX) |
91 |
+ MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) |
92 |
+diff -aurN a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt |
93 |
+--- a/libmariadb/CMakeLists.txt 2018-02-27 16:45:56.434184441 -0500 |
94 |
++++ b/libmariadb/CMakeLists.txt 2018-02-28 09:15:16.258725638 -0500 |
95 |
+@@ -378,7 +378,7 @@ |
96 |
+ ADD_SUBDIRECTORY(include) |
97 |
+ ADD_SUBDIRECTORY(libmariadb) |
98 |
+ ADD_SUBDIRECTORY(plugins) |
99 |
+-IF(NOT WIN32) |
100 |
++IF(NOT WIN32 AND NOT WITHOUT_CLIENTLIBS) |
101 |
+ ADD_SUBDIRECTORY(mariadb_config) |
102 |
+ ENDIF() |
103 |
+ |
104 |
+diff -aurN a/libmariadb/include/CMakeLists.txt b/libmariadb/include/CMakeLists.txt |
105 |
+--- a/libmariadb/include/CMakeLists.txt 2018-02-27 16:45:56.408184952 -0500 |
106 |
++++ b/libmariadb/include/CMakeLists.txt 2018-02-27 16:59:34.668054644 -0500 |
107 |
+@@ -26,6 +26,7 @@ |
108 |
+ SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE) |
109 |
+ ENDIF() |
110 |
+ |
111 |
++IF(NOT WITHOUT_CLIENTLIBS) |
112 |
+ INSTALL(FILES |
113 |
+ ${MARIADB_CLIENT_INCLUDES} |
114 |
+ DESTINATION ${INSTALL_INCLUDEDIR} |
115 |
+@@ -38,3 +39,4 @@ |
116 |
+ ${MARIADB_ADDITIONAL_INCLUDES} |
117 |
+ DESTINATION ${INSTALL_INCLUDEDIR}/mariadb |
118 |
+ COMPONENT Development) |
119 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
120 |
+diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt |
121 |
+--- a/libmariadb/libmariadb/CMakeLists.txt 2018-02-27 16:45:56.421184696 -0500 |
122 |
++++ b/libmariadb/libmariadb/CMakeLists.txt 2018-02-28 09:10:54.981951174 -0500 |
123 |
+@@ -371,8 +371,10 @@ |
124 |
+ "FILE_DESCRIPTION:Dynamic lib for client/server communication") |
125 |
+ ENDIF() |
126 |
+ |
127 |
+-ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) |
128 |
+-TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) |
129 |
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
130 |
++ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) |
131 |
++ TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) |
132 |
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
133 |
+ |
134 |
+ IF(UNIX) |
135 |
+ ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) |
136 |
+@@ -398,7 +400,9 @@ |
137 |
+ TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") |
138 |
+ ENDIF() |
139 |
+ |
140 |
+-SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
141 |
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
142 |
++ SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
143 |
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
144 |
+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
145 |
+ |
146 |
+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") |
147 |
+@@ -412,11 +416,13 @@ |
148 |
+ # of the config program. To make sure these programs can |
149 |
+ # use mariadb client library we provide libmysql symlinks |
150 |
+ |
151 |
+-IF(WITH_MYSQLCOMPAT) |
152 |
++IF(WITH_MYSQLCOMPAT AND NOT WITHOUT_CLIENTLIBS) |
153 |
+ create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) |
154 |
+- create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) |
155 |
+- create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
156 |
+- create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
157 |
++# create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) |
158 |
++ IF(ENABLE_STATIC_LIBS) |
159 |
++ create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
160 |
++# create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
161 |
++ ENDIF(ENABLE_STATIC_LIBS) |
162 |
+ ENDIF() |
163 |
+ |
164 |
+ |
165 |
+@@ -424,12 +430,16 @@ |
166 |
+ ${CPACK_PACKAGE_VERSION_MAJOR} |
167 |
+ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}) |
168 |
+ |
169 |
++IF(NOT WITHOUT_CLIENTLIBS) |
170 |
++IF(ENABLE_STATIC_LIBS) |
171 |
+ INSTALL(TARGETS mariadbclient |
172 |
+ COMPONENT Development |
173 |
+ DESTINATION ${INSTALL_LIBDIR}) |
174 |
++ENDIF(ENABLE_STATIC_LIBS) |
175 |
+ INSTALL(TARGETS libmariadb |
176 |
+ COMPONENT SharedLibraries |
177 |
+ DESTINATION ${INSTALL_LIBDIR}) |
178 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
179 |
+ |
180 |
+ IF(WIN32) |
181 |
+ # On Windows, install PDB |
182 |
+diff -aurN a/libmariadb/plugins/CMakeLists.txt b/libmariadb/plugins/CMakeLists.txt |
183 |
+--- a/libmariadb/plugins/CMakeLists.txt 2018-02-27 16:45:56.445184224 -0500 |
184 |
++++ b/libmariadb/plugins/CMakeLists.txt 2018-02-27 16:59:59.028574104 -0500 |
185 |
+@@ -1,3 +1,4 @@ |
186 |
++IF(NOT WITHOUT_CLIENTLIBS) |
187 |
+ SET(PLUGIN_EXTRA_FILES ${CC_SOURCE_DIR}/libmariadb/ma_errmsg.c) |
188 |
+ FILE(GLOB plugin_dirs ${CC_SOURCE_DIR}/plugins/*) |
189 |
+ FOREACH(dir ${plugin_dirs}) |
190 |
+@@ -5,3 +6,4 @@ |
191 |
+ ADD_SUBDIRECTORY(${dir}) |
192 |
+ ENDIF() |
193 |
+ ENDFOREACH() |
194 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
195 |
+diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt |
196 |
+--- a/scripts/CMakeLists.txt 2018-02-27 16:45:56.384185424 -0500 |
197 |
++++ b/scripts/CMakeLists.txt 2018-02-27 16:54:34.623973364 -0500 |
198 |
+@@ -293,7 +293,6 @@ |
199 |
+ # On Unix, most of the files end up in the bin directory |
200 |
+ SET(BIN_SCRIPTS |
201 |
+ msql2mysql |
202 |
+- mysql_config |
203 |
+ mysql_setpermission |
204 |
+ mysql_secure_installation |
205 |
+ mysqlaccess |
206 |
+@@ -305,6 +304,12 @@ |
207 |
+ ${WSREP_SCRIPTS} |
208 |
+ ${SYSTEMD_SCRIPTS} |
209 |
+ ) |
210 |
++ IF(NOT WITHOUT_CLIENTLIBS) |
211 |
++ SET(BIN_SCRIPTS |
212 |
++ ${BIN_SCRIPTS} |
213 |
++ mysql_config |
214 |
++ ) |
215 |
++ ENDIF(NOT WITHOUT_CLIENTLIBS) |
216 |
+ FOREACH(file ${BIN_SCRIPTS}) |
217 |
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) |
218 |
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh |