From 9c58421e9770bc1719dff1a6f170432bc39aa79f Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Wed, 30 Oct 2019 00:57:09 +0100 Subject: Fix 20018_all_percona-server-8.0.16-without-clientlibs-tools.patch Signed-off-by: Thomas Deutschmann --- ...na-server-8.0.16-without-clientlibs-tools.patch | 80 ++++++++-------------- 1 file changed, 28 insertions(+), 52 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 dd06976..7e025c2 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 @@ -1,18 +1,3 @@ -From b38aad3589e5d7138d366bbde6336421f11829e9 Mon Sep 17 00:00:00 2001 -From: root -Date: Sat, 17 Aug 2019 00:08:53 +0200 -Subject: [PATCH 4/5] 20018_all_percona-server-8.0.18-without-clientlibs-tools - ---- - CMakeLists.txt | 13 +++++++++---- - libmysql/CMakeLists.txt | 23 +++++++++++++++++------ - scripts/CMakeLists.txt | 11 ++++++++--- - support-files/CMakeLists.txt | 4 +++- - utilities/CMakeLists.txt | 15 ++++++++++++--- - 5 files changed, 49 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 586797bf..eac43129 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1047,8 +1047,6 @@ ENDIF() @@ -43,9 +28,9 @@ index 586797bf..eac43129 100644 ADD_SUBDIRECTORY(utilities) ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(libservices) -@@ -1192,6 +1191,12 @@ ENDIF() - ADD_SUBDIRECTORY(scripts) - ADD_SUBDIRECTORY(support-files) +@@ -1182,6 +1181,12 @@ IF(UNIX) + ADD_SUBDIRECTORY(man) + ENDIF() +IF(NOT WITHOUT_TOOLS) + # Add system/bundled editline @@ -54,10 +39,8 @@ index 586797bf..eac43129 100644 +ENDIF(NOT WITHOUT_TOOLS) + IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) -diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt -index 3258ad9b..ca05da85 100644 + ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(sql) --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -240,12 +240,17 @@ IF(WIN32) @@ -100,8 +83,6 @@ index 3258ad9b..ca05da85 100644 TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) IF(WIN32) -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 22683309..541eeefc 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -470,14 +470,12 @@ ELSE() @@ -127,7 +108,7 @@ index 22683309..541eeefc 100644 + SET(BIN_SCRIPTS + ${BIN_SCRIPTS} + mysql_config -+ ) ++ ) + ENDIF(NOT WITHOUT_CLIENTLIBS) + SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) @@ -142,8 +123,6 @@ index 22683309..541eeefc 100644 MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} -diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt -index a5a31590..3b155127 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -64,7 +64,9 @@ IF(UNIX) @@ -157,41 +136,38 @@ index a5a31590..3b155127 100644 SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(sbindir ${prefix}/${INSTALL_SBINDIR}) -diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt -index 9ffb59e6..d7263a75 100644 --- a/utilities/CMakeLists.txt +++ b/utilities/CMakeLists.txt -@@ -90,10 +90,15 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) +@@ -90,6 +90,13 @@ 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(NOT WITHOUT_CLIENTLIBS) -+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) -+ MYSQL_ADD_EXECUTABLE(perror perror.cc) -+ELSE(NOT WITHOUT_CLIENTLIBS) ++IF(WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc SKIP_INSTALL) + MYSQL_ADD_EXECUTABLE(perror perror.cc SKIP_INSTALL) -+ENDIF(NOT WITHOUT_CLIENTLIBS) ++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) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) --MYSQL_ADD_EXECUTABLE(perror perror.cc) - ADD_DEPENDENCIES(perror GenError) - TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) - -@@ -103,7 +108,11 @@ IF (BUILD_BUNDLED_LZ4) +@@ -101,11 +108,14 @@ 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) -- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) -+ IF(NOT WITHOUT_CLIENTLIBS) -+ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) -+ ELSE(NOT WITHOUT_CLIENTLIBS) -+ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc SKIP_INSTALL) -+ ENDIF(NOT WITHOUT_CLIENTLIBS) - TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) - ENDIF() +-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) ++IF(WITHOUT_CLIENTLIBS) ++ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) +- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) +-ENDIF() ++ENDIF(WITHOUT_CLIENTLIBS) ++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) + + IF(WITH_INNOBASE_STORAGE_ENGINE) --- -2.22.1 -- cgit v1.2.3-65-gdbad