commit: da9ce51a55c888d57aab055b16bcdd77937ef833
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 16:39:15 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 16:39:15 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=da9ce51a
client-libs: 5.7.21 patch goes too far for libmysql
20018_all_mysql-5.7.21-without-clientlibs-tools.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
index e0f5369..b9e8f09 100644
--- a/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
+++ b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
@@ -74,17 +74,6 @@ diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
ADD_DEPENDENCIES(perror GenError)
TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
-diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
---- a/libmysql/CMakeLists.txt 2015-07-09 09:04:01.217091000 -0400
-+++ b/libmysql/CMakeLists.txt 2015-07-09 09:22:47.903091000 -0400
-@@ -217,6 +217,6 @@
- ENDIF()
-
--IF(NOT DISABLE_SHARED)
-+IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS)
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
--- a/scripts/CMakeLists.txt 2015-07-09 09:04:00.401091000 -0400
+++ b/scripts/CMakeLists.txt 2015-07-09 09:20:25.723091000 -0400
