diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-03-12 12:39:15 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-03-12 12:39:15 -0400 |
| commit | da9ce51a55c888d57aab055b16bcdd77937ef833 (patch) | |
| tree | 18278624883b39f6a79f50d0b93222aa1eefbc28 | |
| parent | respin client-libs patch for 5.7.21 (diff) | |
| download | mysql-extras-da9ce51a55c888d57aab055b16bcdd77937ef833.tar.gz mysql-extras-da9ce51a55c888d57aab055b16bcdd77937ef833.tar.bz2 mysql-extras-da9ce51a55c888d57aab055b16bcdd77937ef833.zip | |
client-libs: 5.7.21 patch goes too far for libmysql
| -rw-r--r-- | 20018_all_mysql-5.7.21-without-clientlibs-tools.patch | 11 |
1 files changed, 0 insertions, 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 |