| 1 |
commit: e1e48da44c654967c3edf685f903fa4266d64cf8 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 30 00:55:56 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 30 00:55:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=e1e48da4 |
| 7 |
|
| 8 |
Fix 20018_all_percona-server-8.0.16-without-clientlibs-tools.patch |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
...na-server-8.0.16-without-clientlibs-tools.patch | 26 +++++++++++++++------- |
| 13 |
1 file changed, 18 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/20018_all_percona-server-8.0.16-without-clientlibs-tools.patch b/20018_all_percona-server-8.0.16-without-clientlibs-tools.patch |
| 16 |
index 7e025c2..a1211fa 100644 |
| 17 |
--- a/20018_all_percona-server-8.0.16-without-clientlibs-tools.patch |
| 18 |
+++ b/20018_all_percona-server-8.0.16-without-clientlibs-tools.patch |
| 19 |
@@ -138,25 +138,35 @@ |
| 20 |
SET(sbindir ${prefix}/${INSTALL_SBINDIR}) |
| 21 |
--- a/utilities/CMakeLists.txt |
| 22 |
+++ b/utilities/CMakeLists.txt |
| 23 |
-@@ -90,6 +90,13 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) |
| 24 |
+@@ -90,22 +90,35 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) |
| 25 |
ADD_DEPENDENCIES(comp_err copy_openssl_dlls) |
| 26 |
ENDIF() |
| 27 |
|
| 28 |
+-MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) |
| 29 |
+IF(WITHOUT_CLIENTLIBS) |
| 30 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc SKIP_INSTALL) |
| 31 |
+ MYSQL_ADD_EXECUTABLE(perror perror.cc SKIP_INSTALL) |
| 32 |
-+IF(BUILD_BUNDLED_LZ4) |
| 33 |
-+ MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc SKIP_INSTALL) |
| 34 |
-+ENDIF() |
| 35 |
++ IF(BUILD_BUNDLED_LZ4) |
| 36 |
++ MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc SKIP_INSTALL) |
| 37 |
++ ENDIF() |
| 38 |
+ELSE(WITHOUT_CLIENTLIBS) |
| 39 |
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) |
| 40 |
++ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) |
| 41 |
++ MYSQL_ADD_EXECUTABLE(perror perror.cc) |
| 42 |
++ IF (BUILD_BUNDLED_LZ4) |
| 43 |
++ MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) |
| 44 |
++ ENDIF() |
| 45 |
++ENDIF() |
| 46 |
++ |
| 47 |
TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) |
| 48 |
|
| 49 |
-@@ -101,11 +108,14 @@ IF (BUILD_BUNDLED_LZ4) |
| 50 |
- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) |
| 51 |
+-MYSQL_ADD_EXECUTABLE(perror perror.cc) |
| 52 |
+ ADD_DEPENDENCIES(perror GenError) |
| 53 |
+ TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) |
| 54 |
+ |
| 55 |
+ IF (BUILD_BUNDLED_LZ4) |
| 56 |
+- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) |
| 57 |
TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) |
| 58 |
ENDIF() |
| 59 |
-+ENDIF(WITHOUT_CLIENTLIBS) |
| 60 |
|
| 61 |
-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) |
| 62 |
+IF(WITHOUT_CLIENTLIBS) |
Archives