commit: b2acb6e8c9967432ac93905e707d5217f926f9cb Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Mar 17 00:55:56 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Mar 17 00:55:56 2020 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=b2acb6e8
Fix 20018_all_*-8.0.*-without-clientlibs-tools.patch ICU is not required when building client tools only. Bug: https://bugs.gentoo.org/712072 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> 20018_all_mysql-8.0.19-without-clientlibs-tools.patch | 13 ++++++++++++- ...all_percona-server-8.0.18-without-clientlibs-tools.patch | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/20018_all_mysql-8.0.19-without-clientlibs-tools.patch b/20018_all_mysql-8.0.19-without-clientlibs-tools.patch index ea6744e..722ddac 100644 --- a/20018_all_mysql-8.0.19-without-clientlibs-tools.patch +++ b/20018_all_mysql-8.0.19-without-clientlibs-tools.patch @@ -1,6 +1,17 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1285,7 +1285,9 @@ IF(WITH_UNIT_TESTS) +@@ -1200,7 +1200,9 @@ ENDIF() + # Add lz4 library + MYSQL_CHECK_LZ4() + # Add icu library +-MYSQL_CHECK_ICU() ++IF(NOT WITHOUT_SERVER) ++ MYSQL_CHECK_ICU() ++ENDIF() + # Add SASL library + MYSQL_CHECK_SASL() + # Add protoc and libprotobuf +@@ -1285,7 +1287,9 @@ IF(WITH_UNIT_TESTS) INCLUDE(googletest) ENDIF() diff --git a/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch b/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch index bf07285..0b466ea 100644 --- a/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch +++ b/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch @@ -1,6 +1,17 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1284,7 +1284,9 @@ IF(WITH_UNIT_TESTS) +@@ -1199,7 +1199,9 @@ ENDIF() + # Add lz4 library + MYSQL_CHECK_LZ4() + # Add icu library +-MYSQL_CHECK_ICU() ++IF(NOT WITHOUT_SERVER) ++ MYSQL_CHECK_ICU() ++ENDIF() + # Add SASL library + MYSQL_CHECK_SASL() + # Add protoc and libprotobuf +@@ -1284,7 +1286,9 @@ IF(WITH_UNIT_TESTS) INCLUDE(googletest) ENDIF()
