diff options
| -rw-r--r-- | 20018_all_mysql-5.7.21-without-clientlibs-tools.patch | 116 |
1 files changed, 116 insertions, 0 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 new file mode 100644 index 0000000..e0f5369 --- /dev/null +++ b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch @@ -0,0 +1,116 @@ +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2015-07-09 09:04:00.118091000 -0400 ++++ b/CMakeLists.txt 2015-07-09 09:17:06.291091000 -0400 +@@ -405,8 +405,6 @@ + MYSQL_CHECK_ZLIB_WITH_COMPRESS() + # Add bundled yassl/taocrypt or system openssl. + MYSQL_CHECK_SSL() +-# Add system/bundled editline. +-MYSQL_CHECK_EDITLINE() + # Add libevent + MYSQL_CHECK_LIBEVENT() + +@@ -436,7 +434,10 @@ + ADD_SUBDIRECTORY(storage/ndb) + ENDIF() + +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) ++ + ADD_SUBDIRECTORY(dbug) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) +@@ -462,7 +463,6 @@ + ENDIF() + + ADD_SUBDIRECTORY(extra) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(libservices) + +@@ -470,11 +470,20 @@ + 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) +diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt +--- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400 ++++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400 +@@ -72,12 +72,16 @@ + ADD_DEPENDENCIES(GenError copy_openssl_extra) + ENDIF() + +- +-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) +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 +@@ -433,18 +433,21 @@ + + 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") + |