[gentoo-commits] proj/mysql-extras:master commit in: /

[Thomas Deutschmann]

commit:     e1e48da44c654967c3edf685f903fa4266d64cf8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 00:55:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 00:55:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=e1e48da4

Fix 20018_all_percona-server-8.0.16-without-clientlibs-tools.patch

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ...na-server-8.0.16-without-clientlibs-tools.patch | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

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
index 7e025c2..a1211fa 100644
--- a/20018_all_percona-server-8.0.16-without-clientlibs-tools.patch
+++ b/20018_all_percona-server-8.0.16-without-clientlibs-tools.patch
@@ -138,25 +138,35 @@
    SET(sbindir ${prefix}/${INSTALL_SBINDIR})
 --- a/utilities/CMakeLists.txt
 +++ b/utilities/CMakeLists.txt
-@@ -90,6 +90,13 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB)
+@@ -90,22 +90,35 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB)
    ADD_DEPENDENCIES(comp_err copy_openssl_dlls)
  ENDIF()
  
+-MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
 +IF(WITHOUT_CLIENTLIBS)
 +  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc SKIP_INSTALL)
 +  MYSQL_ADD_EXECUTABLE(perror perror.cc SKIP_INSTALL)
-+IF(BUILD_BUNDLED_LZ4)
-+  MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc SKIP_INSTALL)
-+ENDIF()
++  IF(BUILD_BUNDLED_LZ4)
++    MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc SKIP_INSTALL)
++  ENDIF()
 +ELSE(WITHOUT_CLIENTLIBS)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
++  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
++  MYSQL_ADD_EXECUTABLE(perror perror.cc)
++  IF (BUILD_BUNDLED_LZ4)
++    MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
++  ENDIF()
++ENDIF()
++
  TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
  
-@@ -101,11 +108,14 @@ IF (BUILD_BUNDLED_LZ4)
-   MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
+-MYSQL_ADD_EXECUTABLE(perror perror.cc)
+ ADD_DEPENDENCIES(perror GenError)
+ TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
+ 
+ IF (BUILD_BUNDLED_LZ4)
+-  MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
    TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
  ENDIF()
-+ENDIF(WITHOUT_CLIENTLIBS)
  
 -IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
 +IF(WITHOUT_CLIENTLIBS)