1 |
commit: 9c58421e9770bc1719dff1a6f170432bc39aa79f |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 29 23:57:09 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 29 23:57:09 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=9c58421e |
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 | 80 ++++++++-------------- |
13 |
1 file changed, 28 insertions(+), 52 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 dd06976..7e025c2 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 |
@@ -1,18 +1,3 @@ |
20 |
-From b38aad3589e5d7138d366bbde6336421f11829e9 Mon Sep 17 00:00:00 2001 |
21 |
-From: root <root@××××××××××.box> |
22 |
-Date: Sat, 17 Aug 2019 00:08:53 +0200 |
23 |
-Subject: [PATCH 4/5] 20018_all_percona-server-8.0.18-without-clientlibs-tools |
24 |
- |
25 |
---- |
26 |
- CMakeLists.txt | 13 +++++++++---- |
27 |
- libmysql/CMakeLists.txt | 23 +++++++++++++++++------ |
28 |
- scripts/CMakeLists.txt | 11 ++++++++--- |
29 |
- support-files/CMakeLists.txt | 4 +++- |
30 |
- utilities/CMakeLists.txt | 15 ++++++++++++--- |
31 |
- 5 files changed, 49 insertions(+), 17 deletions(-) |
32 |
- |
33 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
34 |
-index 586797bf..eac43129 100644 |
35 |
--- a/CMakeLists.txt |
36 |
+++ b/CMakeLists.txt |
37 |
@@ -1047,8 +1047,6 @@ ENDIF() |
38 |
@@ -43,9 +28,9 @@ index 586797bf..eac43129 100644 |
39 |
ADD_SUBDIRECTORY(utilities) |
40 |
ADD_SUBDIRECTORY(share) |
41 |
ADD_SUBDIRECTORY(libservices) |
42 |
-@@ -1192,6 +1191,12 @@ ENDIF() |
43 |
- ADD_SUBDIRECTORY(scripts) |
44 |
- ADD_SUBDIRECTORY(support-files) |
45 |
+@@ -1182,6 +1181,12 @@ IF(UNIX) |
46 |
+ ADD_SUBDIRECTORY(man) |
47 |
+ ENDIF() |
48 |
|
49 |
+IF(NOT WITHOUT_TOOLS) |
50 |
+ # Add system/bundled editline |
51 |
@@ -54,10 +39,8 @@ index 586797bf..eac43129 100644 |
52 |
+ENDIF(NOT WITHOUT_TOOLS) |
53 |
+ |
54 |
IF(NOT WITHOUT_SERVER) |
55 |
- ADD_SUBDIRECTORY(mysql-test) |
56 |
- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) |
57 |
-diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt |
58 |
-index 3258ad9b..ca05da85 100644 |
59 |
+ ADD_SUBDIRECTORY(testclients) |
60 |
+ ADD_SUBDIRECTORY(sql) |
61 |
--- a/libmysql/CMakeLists.txt |
62 |
+++ b/libmysql/CMakeLists.txt |
63 |
@@ -240,12 +240,17 @@ IF(WIN32) |
64 |
@@ -100,8 +83,6 @@ index 3258ad9b..ca05da85 100644 |
65 |
TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) |
66 |
|
67 |
IF(WIN32) |
68 |
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt |
69 |
-index 22683309..541eeefc 100644 |
70 |
--- a/scripts/CMakeLists.txt |
71 |
+++ b/scripts/CMakeLists.txt |
72 |
@@ -470,14 +470,12 @@ ELSE() |
73 |
@@ -127,7 +108,7 @@ index 22683309..541eeefc 100644 |
74 |
+ SET(BIN_SCRIPTS |
75 |
+ ${BIN_SCRIPTS} |
76 |
+ mysql_config |
77 |
-+ ) |
78 |
++ ) |
79 |
+ ENDIF(NOT WITHOUT_CLIENTLIBS) |
80 |
+ |
81 |
SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) |
82 |
@@ -142,8 +123,6 @@ index 22683309..541eeefc 100644 |
83 |
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") |
84 |
INSTALL(FILES |
85 |
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} |
86 |
-diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt |
87 |
-index a5a31590..3b155127 100644 |
88 |
--- a/support-files/CMakeLists.txt |
89 |
+++ b/support-files/CMakeLists.txt |
90 |
@@ -64,7 +64,9 @@ IF(UNIX) |
91 |
@@ -157,41 +136,38 @@ index a5a31590..3b155127 100644 |
92 |
|
93 |
SET(bindir ${prefix}/${INSTALL_BINDIR}) |
94 |
SET(sbindir ${prefix}/${INSTALL_SBINDIR}) |
95 |
-diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt |
96 |
-index 9ffb59e6..d7263a75 100644 |
97 |
--- a/utilities/CMakeLists.txt |
98 |
+++ b/utilities/CMakeLists.txt |
99 |
-@@ -90,10 +90,15 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) |
100 |
+@@ -90,6 +90,13 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) |
101 |
ADD_DEPENDENCIES(comp_err copy_openssl_dlls) |
102 |
ENDIF() |
103 |
|
104 |
--MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) |
105 |
-+IF(NOT WITHOUT_CLIENTLIBS) |
106 |
-+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) |
107 |
-+ MYSQL_ADD_EXECUTABLE(perror perror.cc) |
108 |
-+ELSE(NOT WITHOUT_CLIENTLIBS) |
109 |
++IF(WITHOUT_CLIENTLIBS) |
110 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc SKIP_INSTALL) |
111 |
+ MYSQL_ADD_EXECUTABLE(perror perror.cc SKIP_INSTALL) |
112 |
-+ENDIF(NOT WITHOUT_CLIENTLIBS) |
113 |
++IF(BUILD_BUNDLED_LZ4) |
114 |
++ MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc SKIP_INSTALL) |
115 |
++ENDIF() |
116 |
++ELSE(WITHOUT_CLIENTLIBS) |
117 |
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) |
118 |
TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) |
119 |
|
120 |
--MYSQL_ADD_EXECUTABLE(perror perror.cc) |
121 |
- ADD_DEPENDENCIES(perror GenError) |
122 |
- TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) |
123 |
- |
124 |
-@@ -103,7 +108,11 @@ IF (BUILD_BUNDLED_LZ4) |
125 |
+@@ -101,11 +108,14 @@ IF (BUILD_BUNDLED_LZ4) |
126 |
+ MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) |
127 |
+ TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) |
128 |
ENDIF() |
129 |
++ENDIF(WITHOUT_CLIENTLIBS) |
130 |
|
131 |
- IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) |
132 |
-- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) |
133 |
-+ IF(NOT WITHOUT_CLIENTLIBS) |
134 |
-+ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) |
135 |
-+ ELSE(NOT WITHOUT_CLIENTLIBS) |
136 |
-+ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc SKIP_INSTALL) |
137 |
-+ ENDIF(NOT WITHOUT_CLIENTLIBS) |
138 |
- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) |
139 |
- ENDIF() |
140 |
+-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) |
141 |
++IF(WITHOUT_CLIENTLIBS) |
142 |
++ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc SKIP_INSTALL) |
143 |
++ELSE(WITHOUT_CLIENTLIBS) |
144 |
+ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) |
145 |
+- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) |
146 |
+-ENDIF() |
147 |
++ENDIF(WITHOUT_CLIENTLIBS) |
148 |
++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) |
149 |
+ |
150 |
+ IF(WITH_INNOBASE_STORAGE_ENGINE) |
151 |
|
152 |
--- |
153 |
-2.22.1 |