1 |
commit: 1f69699a3803985900c7a6ffc1eab5d6bc3d609a |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 20 02:20:54 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 20 02:20:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=1f69699a |
7 |
|
8 |
Add 20018_all_mysql-8.0.19-without-clientlibs-tools.patch |
9 |
|
10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
11 |
|
12 |
...all_mysql-8.0.19-without-clientlibs-tools.patch | 178 +++++++++++++++++++++ |
13 |
1 file changed, 178 insertions(+) |
14 |
|
15 |
diff --git a/20018_all_mysql-8.0.19-without-clientlibs-tools.patch b/20018_all_mysql-8.0.19-without-clientlibs-tools.patch |
16 |
new file mode 100644 |
17 |
index 0000000..ea6744e |
18 |
--- /dev/null |
19 |
+++ b/20018_all_mysql-8.0.19-without-clientlibs-tools.patch |
20 |
@@ -0,0 +1,178 @@ |
21 |
+--- a/CMakeLists.txt |
22 |
++++ b/CMakeLists.txt |
23 |
+@@ -1285,7 +1285,9 @@ IF(WITH_UNIT_TESTS) |
24 |
+ INCLUDE(googletest) |
25 |
+ ENDIF() |
26 |
+ |
27 |
+-ADD_SUBDIRECTORY(include) |
28 |
++IF(NOT WITHOUT_CLIENTLIBS) |
29 |
++ ADD_SUBDIRECTORY(include) |
30 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
31 |
+ ADD_SUBDIRECTORY(strings) |
32 |
+ ADD_SUBDIRECTORY(vio) |
33 |
+ ADD_SUBDIRECTORY(mysys) |
34 |
+--- a/libmysql/CMakeLists.txt |
35 |
++++ b/libmysql/CMakeLists.txt |
36 |
+@@ -242,12 +242,17 @@ IF(WIN32) |
37 |
+ LIST(APPEND LIBS_TO_MERGE auth_win_client) |
38 |
+ ENDIF() |
39 |
+ |
40 |
+-# LDAP authentication SASL client plugin |
41 |
+-MESSAGE(STATUS "Creating LDAP authentication SASL client library.") |
42 |
+-ADD_SUBDIRECTORY(authentication_ldap) |
43 |
+- |
44 |
+-# Merge several convenience libraries into one big mysqlclient |
45 |
+-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) |
46 |
++IF(WITHOUT_CLIENTLIBS) |
47 |
++ # Merge several convenience libraries into one big mysqlclient |
48 |
++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) |
49 |
++ELSE(WITHOUT_CLIENTLIBS) |
50 |
++ # LDAP authentication SASL client plugin |
51 |
++ MESSAGE(STATUS "Creating LDAP authentication SASL client library.") |
52 |
++ ADD_SUBDIRECTORY(authentication_ldap) |
53 |
++ |
54 |
++ # Merge several convenience libraries into one big mysqlclient |
55 |
++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) |
56 |
++ENDIF(WITHOUT_CLIENTLIBS) |
57 |
+ TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) |
58 |
+ |
59 |
+ # Visual Studio users need debug static library for debug projects |
60 |
+@@ -283,12 +288,22 @@ ENDIF() |
61 |
+ |
62 |
+ # Merge several convenience libraries into one big mysqlclient |
63 |
+ # and link them together into shared library. |
64 |
++IF(WITHOUT_CLIENTLIBS) |
65 |
++MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} |
66 |
++ EXPORTS |
67 |
++ ${CLIENT_API_FUNCTIONS} |
68 |
++ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} |
69 |
++ ${CLIENT_API_NONBLOCKING_FUNCTIONS} |
70 |
++ COMPONENT SharedLibraries |
71 |
++ SKIP_INSTALL ) |
72 |
++ELSE(WITHOUT_CLIENTLIBS) |
73 |
+ MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} |
74 |
+ EXPORTS |
75 |
+ ${CLIENT_API_FUNCTIONS} |
76 |
+ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} |
77 |
+ ${CLIENT_API_NONBLOCKING_FUNCTIONS} |
78 |
+ COMPONENT SharedLibraries) |
79 |
++ENDIF(WITHOUT_CLIENTLIBS) |
80 |
+ TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) |
81 |
+ |
82 |
+ IF(WIN32) |
83 |
+--- a/man/CMakeLists.txt |
84 |
++++ b/man/CMakeLists.txt |
85 |
+@@ -26,7 +26,6 @@ SET(MAN1 |
86 |
+ ibd2sdi.1 |
87 |
+ innochecksum.1 |
88 |
+ lz4_decompress.1 |
89 |
+- my_print_defaults.1 |
90 |
+ myisam_ftdump.1 |
91 |
+ myisamchk.1 |
92 |
+ myisamlog.1 |
93 |
+@@ -51,8 +50,6 @@ SET(MAN1 |
94 |
+ mysqlpump.1 |
95 |
+ mysqlshow.1 |
96 |
+ mysqlslap.1 |
97 |
+- perror.1 |
98 |
+- zlib_decompress.1 |
99 |
+ ) |
100 |
+ SET(MAN1_NDB |
101 |
+ ndb-common-options.1 |
102 |
+--- a/scripts/CMakeLists.txt |
103 |
++++ b/scripts/CMakeLists.txt |
104 |
+@@ -414,7 +414,7 @@ ELSE() |
105 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} |
106 |
+ ESCAPE_QUOTES @ONLY) |
107 |
+ |
108 |
+- IF(INSTALL_PKGCONFIGDIR) |
109 |
++ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS) |
110 |
+ MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") |
111 |
+ INSTALL(FILES |
112 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} |
113 |
+@@ -427,19 +427,24 @@ ELSE() |
114 |
+ # mysqld_safe used in mtr even for systemd platforms |
115 |
+ IF(WITH_SYSTEMD) |
116 |
+ SET(BIN_SCRIPTS |
117 |
+- mysql_config |
118 |
+ mysqldumpslow |
119 |
+ mysqld_safe |
120 |
+ ) |
121 |
+ ELSE() |
122 |
+ SET(BIN_SCRIPTS |
123 |
+- mysql_config |
124 |
+ mysqldumpslow |
125 |
+ mysqld_multi |
126 |
+ mysqld_safe |
127 |
+ ) |
128 |
+ ENDIF() |
129 |
+ |
130 |
++ IF(NOT WITHOUT_CLIENTLIBS) |
131 |
++ SET(BIN_SCRIPTS |
132 |
++ ${BIN_SCRIPTS} |
133 |
++ mysql_config |
134 |
++ ) |
135 |
++ ENDIF(NOT WITHOUT_CLIENTLIBS) |
136 |
++ |
137 |
+ FOREACH(file ${BIN_SCRIPTS}) |
138 |
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) |
139 |
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh |
140 |
+--- a/support-files/CMakeLists.txt |
141 |
++++ b/support-files/CMakeLists.txt |
142 |
+@@ -24,8 +24,9 @@ IF(NOT UNIX) |
143 |
+ RETURN() |
144 |
+ ENDIF() |
145 |
+ |
146 |
+-INSTALL(FILES mysql.m4 |
147 |
+- DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) |
148 |
++IF(NOT WITHOUT_CLIENTLIBS) |
149 |
++ INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) |
150 |
++ENDIF(NOT WITHOUT_CLIENTLIBS) |
151 |
+ |
152 |
+ SET(localstatedir "${MYSQL_DATADIR}") |
153 |
+ |
154 |
+--- a/utilities/CMakeLists.txt |
155 |
++++ b/utilities/CMakeLists.txt |
156 |
+@@ -120,6 +120,26 @@ IF(LINUX_INSTALL_RPATH_ORIGIN) |
157 |
+ ADD_DEPENDENCIES(comp_err copy_openssl_dlls) |
158 |
+ ENDIF() |
159 |
+ |
160 |
++IF(WITHOUT_CLIENTLIBS) |
161 |
++MYSQL_ADD_EXECUTABLE(my_print_defaults |
162 |
++ my_print_defaults.cc |
163 |
++ COMPONENT Server |
164 |
++ LINK_LIBRARIES mysys |
165 |
++ SKIP_INSTALL ) |
166 |
++MYSQL_ADD_EXECUTABLE(perror |
167 |
++ perror.cc |
168 |
++ COMPONENT Server |
169 |
++ DEPENDENCIES GenError |
170 |
++ LINK_LIBRARIES mysys |
171 |
++ SKIP_INSTALL ) |
172 |
++IF(BUILD_BUNDLED_LZ4) |
173 |
++ MYSQL_ADD_EXECUTABLE(lz4_decompress |
174 |
++ lz4_decompress.cc |
175 |
++ COMPONENT Server |
176 |
++ LINK_LIBRARIES ${LZ4_LIBRARY} mysys |
177 |
++ SKIP_INSTALL ) |
178 |
++ENDIF() |
179 |
++ELSE(WITHOUT_CLIENTLIBS) |
180 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults |
181 |
+ my_print_defaults.cc |
182 |
+ COMPONENT Server |
183 |
+@@ -138,7 +158,6 @@ IF(BUILD_BUNDLED_LZ4) |
184 |
+ LINK_LIBRARIES ${LZ4_LIBRARY} mysys |
185 |
+ ) |
186 |
+ ENDIF() |
187 |
+- |
188 |
+ IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) |
189 |
+ MYSQL_ADD_EXECUTABLE(zlib_decompress |
190 |
+ zlib_decompress.cc |
191 |
+@@ -146,6 +165,7 @@ IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) |
192 |
+ LINK_LIBRARIES ${ZLIB_LIBRARY} mysys |
193 |
+ ) |
194 |
+ ENDIF() |
195 |
++ENDIF(WITHOUT_CLIENTLIBS) |
196 |
+ |
197 |
+ # All targets below belong to COMPONENT Server and depend on InnoDB. |
198 |
+ IF(WITHOUT_SERVER) |