From 34a0bdaad4e20ddc3446e2bbfb24185d03b6b4b2 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Sat, 25 Jan 2020 20:42:31 +0100 Subject: Add 20018_all_mysql-5.7.29-without-clientlibs-tools.patch Signed-off-by: Thomas Deutschmann --- ...all_mysql-5.7.29-without-clientlibs-tools.patch | 183 +++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 20018_all_mysql-5.7.29-without-clientlibs-tools.patch diff --git a/20018_all_mysql-5.7.29-without-clientlibs-tools.patch b/20018_all_mysql-5.7.29-without-clientlibs-tools.patch new file mode 100644 index 0000000..3f00c0a --- /dev/null +++ b/20018_all_mysql-5.7.29-without-clientlibs-tools.patch @@ -0,0 +1,183 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -577,8 +577,6 @@ IF(BUILD_BUNDLED_ZLIB) + ENDIF() + # Add openssl. + MYSQL_CHECK_SSL() +-# Add system/bundled editline. +-MYSQL_CHECK_EDITLINE() + # Add libevent + IF(NOT WITHOUT_SERVER) + MYSQL_CHECK_LIBEVENT() +@@ -673,7 +671,10 @@ IF(WITH_UNIT_TESTS) + ENABLE_TESTING() + ENDIF() + +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) ++ + ADD_SUBDIRECTORY(dbug) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) +@@ -720,7 +721,6 @@ IF(WITH_UNIT_TESTS) + ENDIF() + + ADD_SUBDIRECTORY(extra) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(libservices) + +@@ -728,11 +728,20 @@ IF(UNIX) + ADD_SUBDIRECTORY(man) + ENDIF() + ++IF(NOT WITHOUT_TOOLS) ++ # Add system/bundled editline ++ MYSQL_CHECK_EDITLINE() ++ ADD_SUBDIRECTORY(client) ++ENDIF(NOT WITHOUT_TOOLS) ++ + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) ++ IF(WITHOUT_TOOLS) ++ MYSQL_CHECK_EDITLINE() ++ ENDIF(WITHOUT_TOOLS) + ADD_SUBDIRECTORY(libmysqld) + ADD_SUBDIRECTORY(libmysqld/examples) + ENDIF(WITH_EMBEDDED_SERVER) +--- a/extra/CMakeLists.txt ++++ b/extra/CMakeLists.txt +@@ -71,11 +71,16 @@ ADD_CUSTOM_TARGET(GenError + # Set InnoDB mutex type + ADD_DEFINITIONS(-DMUTEX_EVENT) + +-MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++IF(NOT WITHOUT_CLIENTLIBS) ++ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++ MYSQL_ADD_EXECUTABLE(perror perror.c) ++ELSE(NOT WITHOUT_CLIENTLIBS) ++ ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++ ADD_EXECUTABLE(perror perror.c) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) + SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) + +-MYSQL_ADD_EXECUTABLE(perror perror.c) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys mysys_ssl) + SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX) +@@ -94,10 +99,15 @@ ENDIF() + MYSQL_ADD_EXECUTABLE(replace replace.c) + TARGET_LINK_LIBRARIES(replace mysys) + +-MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) +-TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY}) ++IF(NOT WITHOUT_CLIENTLIBS) ++ MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) ++ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) ++ELSE(NOT WITHOUT_CLIENTLIBS) ++ ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) ++ ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + +-MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) ++TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY}) + TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY}) + + IF(WITH_INNOBASE_STORAGE_ENGINE) +--- a/libmysql/CMakeLists.txt ++++ b/libmysql/CMakeLists.txt +@@ -263,12 +263,17 @@ IF(WIN32) + LIST(APPEND LIBS_TO_MERGE auth_win_client) + ENDIF() + +-# LDAP authentication SASL client plugin +-MESSAGE(STATUS "Creating LDAP authentication SASL client library.") +-ADD_SUBDIRECTORY(authentication_ldap) +- +-# Merge several convenience libraries into one big mysqlclient +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) ++IF(WITHOUT_CLIENTLIBS) ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) ++ # LDAP authentication SASL client plugin ++ MESSAGE(STATUS "Creating LDAP authentication SASL client library.") ++ ADD_SUBDIRECTORY(authentication_ldap) ++ ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) ++ENDIF(WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) + + # Visual Studio users need debug static library for debug projects +@@ -312,9 +317,15 @@ ENDIF() + IF(NOT DISABLE_SHARED) + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. ++IF(WITHOUT_CLIENTLIBS) ++ MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} ++ EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ++ COMPONENT SharedLibraries SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} + COMPONENT SharedLibraries) ++ENDIF(WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) + IF(UNIX) + # libtool compatability +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -423,18 +423,21 @@ ELSE() + + IF(WITH_SYSTEMD) + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + ) + ELSE() + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + mysqld_multi + mysqld_safe + ) + ENDIF() +- ++ IF(NOT WITHOUT_CLIENTLIBS) ++ SET(BIN_SCRIPTS ++ ${BIN_SCRIPTS} ++ mysql_config ++ ) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) + SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) + STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") + SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig") +@@ -449,7 +452,7 @@ ELSE() + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} + ESCAPE_QUOTES @ONLY) + +- IF(INSTALL_PKGCONFIGDIR) ++ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS) + MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") + INSTALL(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} +--- a/support-files/CMakeLists.txt ++++ b/support-files/CMakeLists.txt +@@ -66,8 +66,9 @@ IF(UNIX) + IF(INSTALL_SUPPORTFILESDIR) + INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) + ENDIF() +- ++IF(NOT WITHOUT_CLIENTLIBS) + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + + SET(bindir ${prefix}/${INSTALL_BINDIR}) + SET(sbindir ${prefix}/${INSTALL_SBINDIR}) -- cgit v1.2.3-65-gdbad