From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 22690138334 for ; Thu, 22 Aug 2019 19:08:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B29AE09E1; Thu, 22 Aug 2019 19:08:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2406CE09E1 for ; Thu, 22 Aug 2019 19:08:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD9F634A142 for ; Thu, 22 Aug 2019 19:08:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39090622 for ; Thu, 22 Aug 2019 19:08:37 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1566500002.45d70904911e890421d4dd2c73ebb93ee9c99a73.whissi@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mysql-5.7.26-without-clientlibs-tools.patch 20018_all_percona-server-5.7.26-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 45d70904911e890421d4dd2c73ebb93ee9c99a73 X-VCS-Branch: master Date: Thu, 22 Aug 2019 19:08:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 14a56243-8809-417a-a1a2-3f32b86ca29f X-Archives-Hash: 3980f368ff8a14387d0b00011b9e11a8 commit: 45d70904911e890421d4dd2c73ebb93ee9c99a73 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Aug 22 17:53:06 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Aug 22 18:53:22 2019 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=45d70904 Add 20018_all_{mysql,percona-server}-5.7.26-without-clientlibs-tools.patch Don't install {lz4,zlib}_decompress. Signed-off-by: Thomas Deutschmann gentoo.org> ...all_mysql-5.7.26-without-clientlibs-tools.patch | 183 ++++++++++++++++++++ ...na-server-5.7.26-without-clientlibs-tools.patch | 189 +++++++++++++++++++++ 2 files changed, 372 insertions(+) diff --git a/20018_all_mysql-5.7.26-without-clientlibs-tools.patch b/20018_all_mysql-5.7.26-without-clientlibs-tools.patch new file mode 100644 index 0000000..b4a8d2b --- /dev/null +++ b/20018_all_mysql-5.7.26-without-clientlibs-tools.patch @@ -0,0 +1,183 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -551,8 +551,6 @@ IF(BUILD_BUNDLED_ZLIB) + ENDIF() + # Add bundled yassl/taocrypt or system openssl. + MYSQL_CHECK_SSL() +-# Add system/bundled editline. +-MYSQL_CHECK_EDITLINE() + # Add libevent + IF(NOT WITHOUT_SERVER) + MYSQL_CHECK_LIBEVENT() +@@ -645,7 +643,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) +@@ -692,7 +693,6 @@ IF(WITH_UNIT_TESTS) + ENDIF() + + ADD_SUBDIRECTORY(extra) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(libservices) + +@@ -700,11 +700,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,12 +71,16 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRYPTO_DLL) + 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) +@@ -95,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 +@@ -232,12 +232,16 @@ IF(WIN32) + LIST(APPEND LIBS 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} COMPONENT Development) ++IF(WITHOUT_CLIENTLIBS) ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} 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} COMPONENT Development) ++ENDIF(WITHOUT_CLIENTLIBS) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) +@@ -284,9 +288,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} ++ EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ++ COMPONENT SharedLibraries SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES_SHARED(libmysql ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} + COMPONENT SharedLibraries) ++ENDIF(WITHOUT_CLIENTLIBS) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -413,18 +413,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") +@@ -439,7 +442,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 +@@ -59,8 +59,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}) diff --git a/20018_all_percona-server-5.7.26-without-clientlibs-tools.patch b/20018_all_percona-server-5.7.26-without-clientlibs-tools.patch new file mode 100644 index 0000000..331ad54 --- /dev/null +++ b/20018_all_percona-server-5.7.26-without-clientlibs-tools.patch @@ -0,0 +1,189 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -545,8 +545,6 @@ IF(BUILD_BUNDLED_ZLIB) + ENDIF() + # Add bundled yassl/taocrypt or system openssl. + MYSQL_CHECK_SSL() +-# Add system/bundled editline. +-MYSQL_CHECK_EDITLINE() + # Add libevent + MYSQL_CHECK_LIBEVENT() + # Add lz4 library +@@ -637,7 +635,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) +@@ -678,7 +679,6 @@ IF(WITH_UNIT_TESTS) + ENDIF() + + ADD_SUBDIRECTORY(extra) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(libservices) + +@@ -686,11 +686,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,12 +71,16 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRYPTO_DLL) + 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) +@@ -95,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 +@@ -232,12 +232,17 @@ IF(WIN32) + LIST(APPEND LIBS 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 perconaserverclient +-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development) ++IF(WITHOUT_CLIENTLIBS) ++ # Merge several convenience libraries into one big perconaserverclient ++ MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} 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 perconaserverclient ++ MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development) ++ENDIF(WITHOUT_CLIENTLIBS) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) +@@ -284,9 +289,15 @@ ENDIF() + IF(NOT DISABLE_SHARED) + # Merge several convenience libraries into one big perconaserverclient + # and link them together into shared library. ++IF(WITHOUT_CLIENTLIBS) ++ MERGE_LIBRARIES_SHARED(libmysql ${LIBS} ++ EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ++ COMPONENT SharedLibraries SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES_SHARED(libmysql ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} + COMPONENT SharedLibraries) ++ENDIF(WITHOUT_CLIENTLIBS) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -411,7 +411,6 @@ ELSE() + + IF(WITH_SYSTEMD) + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + ps_tokudb_admin + ps_mysqld_helper +@@ -419,7 +418,6 @@ ELSE() + ) + ELSE() + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + mysqld_multi + mysqld_safe +@@ -429,6 +427,13 @@ ELSE() + ) + 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") +@@ -443,7 +448,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 +@@ -59,8 +59,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})