1 |
commit: 41f7ff6e82003f33150a67783e3e0a1ee260af45 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 5 20:47:26 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 5 20:47:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=41f7ff6e |
7 |
|
8 |
Respin clientlibs patch for 10.3.12 |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
11 |
|
12 |
..._mariadb-10.3.12-without-clientlibs-tools.patch | 247 +++++++++++++++++++++ |
13 |
1 file changed, 247 insertions(+) |
14 |
|
15 |
diff --git a/20018_all_mariadb-10.3.12-without-clientlibs-tools.patch b/20018_all_mariadb-10.3.12-without-clientlibs-tools.patch |
16 |
new file mode 100644 |
17 |
index 0000000..dca9f0f |
18 |
--- /dev/null |
19 |
+++ b/20018_all_mariadb-10.3.12-without-clientlibs-tools.patch |
20 |
@@ -0,0 +1,247 @@ |
21 |
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt |
22 |
+--- a/CMakeLists.txt 2018-02-27 16:45:56.740178421 -0500 |
23 |
++++ b/CMakeLists.txt 2018-02-28 09:06:59.163673185 -0500 |
24 |
+@@ -339,8 +339,6 @@ |
25 |
+ MYSQL_CHECK_ZLIB_WITH_COMPRESS() |
26 |
+ # Add bundled yassl/taocrypt or system openssl. |
27 |
+ MYSQL_CHECK_SSL() |
28 |
+-# Add readline or libedit. |
29 |
+-MYSQL_CHECK_READLINE() |
30 |
+ |
31 |
+ SET(MALLOC_LIBRARY "system") |
32 |
+ |
33 |
+@@ -377,28 +375,38 @@ |
34 |
+ |
35 |
+ SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") |
36 |
+ |
37 |
+-INCLUDE(submodules) |
38 |
+ INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) |
39 |
+ |
40 |
+ # Add storage engines and plugins. |
41 |
+ CONFIGURE_PLUGINS() |
42 |
+ |
43 |
+-ADD_SUBDIRECTORY(include) |
44 |
++IF(NOT WITHOUT_CLIENTLIBS) |
45 |
++ ADD_SUBDIRECTORY(include) |
46 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
47 |
++ |
48 |
+ ADD_SUBDIRECTORY(dbug) |
49 |
+ ADD_SUBDIRECTORY(strings) |
50 |
+ ADD_SUBDIRECTORY(vio) |
51 |
+ ADD_SUBDIRECTORY(mysys) |
52 |
+ ADD_SUBDIRECTORY(mysys_ssl) |
53 |
+-ADD_SUBDIRECTORY(client) |
54 |
+ ADD_SUBDIRECTORY(extra) |
55 |
+ ADD_SUBDIRECTORY(libservices) |
56 |
+ ADD_SUBDIRECTORY(sql/share) |
57 |
+ |
58 |
++IF(NOT WITHOUT_TOOLS) |
59 |
++ # Add readline or libedit. |
60 |
++ MYSQL_CHECK_READLINE() |
61 |
++ ADD_SUBDIRECTORY(client) |
62 |
++ENDIF(NOT WITHOUT_TOOLS) |
63 |
++ |
64 |
+ IF(NOT WITHOUT_SERVER) |
65 |
+ ADD_SUBDIRECTORY(tests) |
66 |
+ ADD_SUBDIRECTORY(sql) |
67 |
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) |
68 |
+- IF(WITH_EMBEDDED_SERVER) |
69 |
++ IF(WITH_EMBEDDED_SERVER) |
70 |
++ IF(WITHOUT_TOOLS) |
71 |
++ MYSQL_CHECK_READLINE() |
72 |
++ ENDIF(WITHOUT_TOOLS) |
73 |
+ ADD_SUBDIRECTORY(libmysqld) |
74 |
+ ADD_SUBDIRECTORY(libmysqld/examples) |
75 |
+ ENDIF(WITH_EMBEDDED_SERVER) |
76 |
+diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt |
77 |
+--- a/extra/CMakeLists.txt 2018-02-25 22:27:15.000000000 -0500 |
78 |
++++ b/extra/CMakeLists.txt 2018-03-09 10:08:24.532158129 -0500 |
79 |
+@@ -46,10 +46,15 @@ |
80 |
+ DEPENDS |
81 |
+ ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) |
82 |
+ |
83 |
++IF(NOT WITHOUT_CLIENTLIBS) |
84 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) |
85 |
++MYSQL_ADD_EXECUTABLE(perror perror.c) |
86 |
++ELSE(NOT WITHOUT_CLIENTLIBS) |
87 |
++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) |
88 |
++ADD_EXECUTABLE(perror perror.c) |
89 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
90 |
+ TARGET_LINK_LIBRARIES(my_print_defaults mysys) |
91 |
+ |
92 |
+-MYSQL_ADD_EXECUTABLE(perror perror.c) |
93 |
+ ADD_DEPENDENCIES(perror GenError) |
94 |
+ TARGET_LINK_LIBRARIES(perror mysys) |
95 |
+ |
96 |
+diff -aurN a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt |
97 |
+--- a/libmariadb/CMakeLists.txt 2018-02-27 16:45:56.434184441 -0500 |
98 |
++++ b/libmariadb/CMakeLists.txt 2018-02-28 09:15:16.258725638 -0500 |
99 |
+@@ -378,6 +378,6 @@ |
100 |
+ ADD_SUBDIRECTORY(include) |
101 |
+ ADD_SUBDIRECTORY(libmariadb) |
102 |
+-IF(NOT WIN32) |
103 |
++IF(NOT WIN32 AND NOT WITHOUT_CLIENTLIBS) |
104 |
+ ADD_SUBDIRECTORY(mariadb_config) |
105 |
+ ENDIF() |
106 |
+ |
107 |
+diff -aurN a/libmariadb/include/CMakeLists.txt b/libmariadb/include/CMakeLists.txt |
108 |
+--- a/libmariadb/include/CMakeLists.txt 2018-02-27 16:45:56.408184952 -0500 |
109 |
++++ b/libmariadb/include/CMakeLists.txt 2018-02-27 16:59:34.668054644 -0500 |
110 |
+@@ -26,6 +26,7 @@ |
111 |
+ SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE) |
112 |
+ ENDIF() |
113 |
+ |
114 |
++IF(NOT WITHOUT_CLIENTLIBS) |
115 |
+ INSTALL(FILES |
116 |
+ ${MARIADB_CLIENT_INCLUDES} |
117 |
+ DESTINATION ${INSTALL_INCLUDEDIR} |
118 |
+@@ -38,3 +39,4 @@ |
119 |
+ ${MARIADB_ADDITIONAL_INCLUDES} |
120 |
+ DESTINATION ${INSTALL_INCLUDEDIR}/mariadb |
121 |
+ COMPONENT Development) |
122 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
123 |
+diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt |
124 |
+--- a/libmariadb/libmariadb/CMakeLists.txt 2018-02-27 16:45:56.421184696 -0500 |
125 |
++++ b/libmariadb/libmariadb/CMakeLists.txt 2018-02-28 09:10:54.981951174 -0500 |
126 |
+@@ -371,8 +371,10 @@ |
127 |
+ "FILE_DESCRIPTION:Dynamic lib for client/server communication") |
128 |
+ ENDIF() |
129 |
+ |
130 |
+-ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) |
131 |
+-TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) |
132 |
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
133 |
++ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) |
134 |
++ TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) |
135 |
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
136 |
+ |
137 |
+ IF(UNIX) |
138 |
+ ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) |
139 |
+@@ -398,7 +400,9 @@ |
140 |
+ TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") |
141 |
+ ENDIF() |
142 |
+ |
143 |
+-SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
144 |
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
145 |
++ SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
146 |
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
147 |
+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
148 |
+ |
149 |
+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") |
150 |
+@@ -412,11 +416,13 @@ |
151 |
+ # of the config program. To make sure these programs can |
152 |
+ # use mariadb client library we provide libmysql symlinks |
153 |
+ |
154 |
+-IF(WITH_MYSQLCOMPAT) |
155 |
++IF(WITH_MYSQLCOMPAT AND NOT WITHOUT_CLIENTLIBS) |
156 |
+ create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) |
157 |
+- create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) |
158 |
+- create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
159 |
+- create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
160 |
++# create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR}) |
161 |
++ IF(ENABLE_STATIC_LIBS) |
162 |
++ create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
163 |
++# create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) |
164 |
++ ENDIF(ENABLE_STATIC_LIBS) |
165 |
+ ENDIF() |
166 |
+ |
167 |
+ |
168 |
+@@ -424,12 +430,16 @@ |
169 |
+ ${CPACK_PACKAGE_VERSION_MAJOR} |
170 |
+ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}) |
171 |
+ |
172 |
++IF(NOT WITHOUT_CLIENTLIBS) |
173 |
++IF(ENABLE_STATIC_LIBS) |
174 |
+ INSTALL(TARGETS mariadbclient |
175 |
+ COMPONENT Development |
176 |
+ DESTINATION ${INSTALL_LIBDIR}) |
177 |
++ENDIF(ENABLE_STATIC_LIBS) |
178 |
+ INSTALL(TARGETS libmariadb |
179 |
+ COMPONENT SharedLibraries |
180 |
+ DESTINATION ${INSTALL_LIBDIR}) |
181 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
182 |
+ |
183 |
+ IF(WIN32) |
184 |
+ # On Windows, install PDB |
185 |
+diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt |
186 |
+--- a/scripts/CMakeLists.txt 2018-02-27 16:45:56.384185424 -0500 |
187 |
++++ b/scripts/CMakeLists.txt 2018-02-27 16:54:34.623973364 -0500 |
188 |
+@@ -293,7 +293,6 @@ |
189 |
+ # On Unix, most of the files end up in the bin directory |
190 |
+ SET(BIN_SCRIPTS |
191 |
+ msql2mysql |
192 |
+- mysql_config |
193 |
+ mysql_setpermission |
194 |
+ mysql_secure_installation |
195 |
+ mysqlaccess |
196 |
+@@ -305,6 +304,12 @@ |
197 |
+ ${WSREP_SCRIPTS} |
198 |
+ ${SYSTEMD_SCRIPTS} |
199 |
+ ) |
200 |
++ IF(NOT WITHOUT_CLIENTLIBS) |
201 |
++ SET(BIN_SCRIPTS |
202 |
++ ${BIN_SCRIPTS} |
203 |
++ mysql_config |
204 |
++ ) |
205 |
++ ENDIF(NOT WITHOUT_CLIENTLIBS) |
206 |
+ FOREACH(file ${BIN_SCRIPTS}) |
207 |
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) |
208 |
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh |
209 |
+diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh |
210 |
+--- a/scripts/mysql_install_db.sh 2018-08-04 18:20:58.000000000 -0400 |
211 |
++++ b/scripts/mysql_install_db.sh 2018-08-09 12:23:28.707894151 -0400 |
212 |
+@@ -280,10 +280,10 @@ |
213 |
+ print_defaults="$builddir/extra/my_print_defaults" |
214 |
+ elif test -n "$basedir" |
215 |
+ then |
216 |
+- print_defaults=`find_in_dirs my_print_defaults $basedir/bin $basedir/extra` |
217 |
++ print_defaults=`find_in_dirs my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra` |
218 |
+ if test -z "$print_defaults" |
219 |
+ then |
220 |
+- cannot_find_file my_print_defaults $basedir/bin $basedir/extra |
221 |
++ cannot_find_file my_print_defaults $basedir/libexec/mariadb $basedir/bin $basedir/extra |
222 |
+ exit 1 |
223 |
+ fi |
224 |
+ else |
225 |
+diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh |
226 |
+--- a/scripts/wsrep_sst_common.sh 2018-08-04 18:20:58.000000000 -0400 |
227 |
++++ b/scripts/wsrep_sst_common.sh 2018-08-09 12:30:24.976706933 -0400 |
228 |
+@@ -148,6 +148,7 @@ |
229 |
+ SCRIPTS_DIR="$(cd $(dirname "$0"); pwd -P)" |
230 |
+ EXTRA_DIR="$SCRIPTS_DIR/../extra" |
231 |
+ CLIENT_DIR="$SCRIPTS_DIR/../client" |
232 |
++LIBEXEC_DIR="$SCRIPTS_DIR/../libexec/mariadb" |
233 |
+ |
234 |
+ if [ -x "$CLIENT_DIR/mysql" ]; then |
235 |
+ MYSQL_CLIENT="$CLIENT_DIR/mysql" |
236 |
+@@ -165,10 +166,12 @@ |
237 |
+ MYSQLDUMP=mysqldump |
238 |
+ fi |
239 |
+ |
240 |
++if [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then |
241 |
++ MY_PRINT_DEFAULTS="$LIBEXEC_DIR/my_print_defaults" |
242 |
+-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then |
243 |
++elif [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then |
244 |
+ MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults" |
245 |
+ elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then |
246 |
+ MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults" |
247 |
+ else |
248 |
+ MY_PRINT_DEFAULTS=my_print_defaults |
249 |
+ fi |
250 |
+diff -aurN a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh |
251 |
+--- a/scripts/mysqld_safe.sh 2019-02-09 18:24:09.000000000 -0500 |
252 |
++++ b/scripts/mysqld_safe.sh 2019-03-05 15:30:25.455288087 -0500 |
253 |
+@@ -133,7 +133,13 @@ |
254 |
+ } |
255 |
+ |
256 |
+ find_in_bin() { |
257 |
+- if test -x "$MY_BASEDIR_VERSION/bin/$1" |
258 |
++ if test -x "$MY_BASEDIR_VERSION/libexec/mariadb/$1" |
259 |
++ then |
260 |
++ echo "$MY_BASEDIR_VERSION/libexec/mariadb/$1" |
261 |
++ elif test -x "@bindir@/../libexec/mariadb/$1" |
262 |
++ then |
263 |
++ echo "@bindir@/../libexec/mariadb/$1" |
264 |
++ elif test -x "$MY_BASEDIR_VERSION/$1" |
265 |
+ then |
266 |
+ echo "$MY_BASEDIR_VERSION/bin/$1" |
267 |
+ elif test -x "@bindir@/$1" |