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 7EC50139694 for ; Wed, 19 Jul 2017 01:08:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9548EE0D75; Wed, 19 Jul 2017 01:08:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 61167E0D75 for ; Wed, 19 Jul 2017 01:08:37 +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 163943418D1 for ; Wed, 19 Jul 2017 01:08:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B111574B5 for ; Wed, 19 Jul 2017 01:08:34 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1500426502.21dd13b194ced117eb6b025f1be320954712df53.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mariadb-10.2.7-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 21dd13b194ced117eb6b025f1be320954712df53 X-VCS-Branch: master Date: Wed, 19 Jul 2017 01:08:34 +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-Archives-Salt: 6ae6386a-13a7-412b-b276-18709fde30c0 X-Archives-Hash: 851e23753e4902ae90daaefb8dccf658 commit: 21dd13b194ced117eb6b025f1be320954712df53 Author: Brian Evans gentoo org> AuthorDate: Wed Jul 19 01:08:22 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Jul 19 01:08:22 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=21dd13b1 Adjust patch for 10.2.7 ...l_mariadb-10.2.7-without-clientlibs-tools.patch | 144 +++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch new file mode 100644 index 0000000..9ff438d --- /dev/null +++ b/20018_all_mariadb-10.2.7-without-clientlibs-tools.patch @@ -0,0 +1,144 @@ +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2017-05-14 19:13:15.000000000 -0400 ++++ b/CMakeLists.txt 2017-06-28 13:14:25.686006673 -0400 +@@ -325,8 +325,6 @@ + MYSQL_CHECK_ZLIB_WITH_COMPRESS() + # Add bundled yassl/taocrypt or system openssl. + MYSQL_CHECK_SSL() +-# Add readline or libedit. +-MYSQL_CHECK_READLINE() + + SET(MALLOC_LIBRARY "system") + +@@ -363,28 +361,41 @@ + + SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") + ++IF(NOT WITHOUT_CLIENTLIBS) + # mariadb_connector_c fetches submodules which is useful for plugins + INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) ++ENDIF() + + # Add storage engines and plugins. + CONFIGURE_PLUGINS() + +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) ++ + ADD_SUBDIRECTORY(dbug) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) + ADD_SUBDIRECTORY(mysys) + ADD_SUBDIRECTORY(mysys_ssl) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(extra) + ADD_SUBDIRECTORY(libservices) + ADD_SUBDIRECTORY(sql/share) + ++IF(NOT WITHOUT_TOOLS) ++ # Add readline or libedit ++ MYSQL_CHECK_READLINE() ++ ADD_SUBDIRECTORY(client) ++ENDIF(NOT WITHOUT_TOOLS) ++ + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) ++ IF(WITHOUT_TOOLS) ++ MYSQL_CHECK_READLINE() ++ 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 2017-05-14 19:13:15.000000000 -0400 ++++ b/extra/CMakeLists.txt 2017-06-28 12:54:14.972089739 -0400 +@@ -46,12 +46,14 @@ + DEPENDS + ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) + +-MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) +-TARGET_LINK_LIBRARIES(my_print_defaults mysys) ++IF(NOT WITHOUT_CLIENTLIBS) ++ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++ TARGET_LINK_LIBRARIES(my_print_defaults mysys) + +-MYSQL_ADD_EXECUTABLE(perror perror.c) +-ADD_DEPENDENCIES(perror GenError) +-TARGET_LINK_LIBRARIES(perror mysys) ++ MYSQL_ADD_EXECUTABLE(perror perror.c) ++ ADD_DEPENDENCIES(perror GenError) ++ TARGET_LINK_LIBRARIES(perror mysys) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + + IF(UNIX) + MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) +diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt +--- a/libmariadb/libmariadb/CMakeLists.txt 2017-05-14 19:13:15.000000000 -0400 ++++ b/libmariadb/libmariadb/CMakeLists.txt 2017-06-28 13:08:17.185731795 -0400 +@@ -380,8 +380,10 @@ + "FILE_DESCRIPTION:Dynamic lib for client/server communication") + ENDIF() + +-ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) +-TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) ++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) ++ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) ++ TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) ++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) + + IF(UNIX) + ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) +@@ -379,7 +381,9 @@ + TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CC_BINARY_DIR}/libmariadb/mariadbclient.def") + ENDIF() + ++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") ++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") + + SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") +@@ -398,9 +402,11 @@ + ${CPACK_PACKAGE_VERSION_MAJOR} + SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}) + ++IF(ENABLE_STATIC_LIBS) + INSTALL(TARGETS mariadbclient + COMPONENT Development + DESTINATION ${INSTALL_LIBDIR}) ++ENDIF(ENABLE_STATIC_LIBS) + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries + DESTINATION ${INSTALL_LIBDIR}) +diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +--- a/scripts/CMakeLists.txt 2017-05-14 19:13:18.000000000 -0400 ++++ b/scripts/CMakeLists.txt 2017-06-28 12:56:23.774081970 -0400 +@@ -276,7 +276,6 @@ + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config + mysql_setpermission + mysql_secure_installation + mysqlaccess +@@ -288,6 +287,12 @@ + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} + ) ++ IF(NOT WITHOUT_CLIENTLIBS) ++ SET(BIN_SCRIPTS ++ ${BIN_SCRIPTS} ++ mysql_config ++ ) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) + FOREACH(file ${BIN_SCRIPTS}) + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh +diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt +--- a/libmariadb/libmariadb/CMakeLists.txt 2017-07-18 20:36:19.699737005 -0400 ++++ b/libmariadb/libmariadb/CMakeLists.txt 2017-07-18 20:49:58.260498557 -0400