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 B20AC1382C5 for ; Wed, 28 Mar 2018 20:33:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83DF8E085E; Wed, 28 Mar 2018 20:33:57 +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 4753CE085E for ; Wed, 28 Mar 2018 20:33:56 +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 90F06335CD9 for ; Wed, 28 Mar 2018 20:33:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A48721D for ; Wed, 28 Mar 2018 20:33:52 +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: <1522269221.82e97f419283b275ce708b44b355b39d400876b3.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_percona-server-5.6.39-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 82e97f419283b275ce708b44b355b39d400876b3 X-VCS-Branch: master Date: Wed, 28 Mar 2018 20:33:52 +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: 33a15d57-7daf-4f90-8242-d5c13254c340 X-Archives-Hash: 426e3d36ef80546aafceaa77ed3a0e82 commit: 82e97f419283b275ce708b44b355b39d400876b3 Author: Brian Evans gentoo org> AuthorDate: Wed Mar 28 20:33:41 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Mar 28 20:33:41 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=82e97f41 Respin client-libs patch for percona 5.6.39 ...na-server-5.6.39-without-clientlibs-tools.patch | 125 +++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/20018_all_percona-server-5.6.39-without-clientlibs-tools.patch b/20018_all_percona-server-5.6.39-without-clientlibs-tools.patch new file mode 100644 index 0000000..0630dfe --- /dev/null +++ b/20018_all_percona-server-5.6.39-without-clientlibs-tools.patch @@ -0,0 +1,125 @@ +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2018-03-28 16:15:18.101318534 -0400 ++++ b/CMakeLists.txt 2018-03-28 16:18:43.863239965 -0400 +@@ -452,8 +452,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() + +@@ -490,7 +488,9 @@ + 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) +@@ -515,7 +515,6 @@ + ENDIF() + + ADD_SUBDIRECTORY(extra) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(libservices) + +@@ -523,6 +522,13 @@ + 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(tests) + ADD_SUBDIRECTORY(sql) +diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt +--- a/extra/CMakeLists.txt 2018-03-28 16:15:17.764325211 -0400 ++++ b/extra/CMakeLists.txt 2018-03-28 16:20:44.569845200 -0400 +@@ -60,11 +60,16 @@ + ENDIF() + + ++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 2018-03-28 16:15:18.014320257 -0400 ++++ b/libmysql/CMakeLists.txt 2018-03-28 16:31:25.938114668 -0400 +@@ -181,8 +181,13 @@ + LIST(APPEND LIBS auth_win_client) + ENDIF() + ++SET(INSTALL_STATIC_LIBS "") ++IF(NOT ENABLE_STATIC_LIBS) ++ SET(INSTALL_STATIC_LIBS "NOINSTALL") ++ENDIF() ++ + # Merge several convenience libraries into one big perconaserverclient +-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development) ++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development ${INSTALL_STATIC_LIBS}) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) +@@ -210,14 +215,14 @@ + ENDMACRO() + ENDIF() + +-IF(UNIX) ++IF(UNIX AND ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS) + GET_TARGET_NAME(perconaserverclient lib_name) + INSTALL_SYMLINK(perconaserverclient + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a + ${INSTALL_LIBDIR} Development) + ENDIF() + +-IF(NOT DISABLE_SHARED) ++IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS) + # Merge several convenience libraries into one big perconaserverclient + # 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 2018-03-28 16:15:17.706326360 -0400 ++++ b/scripts/CMakeLists.txt 2018-03-28 16:29:23.168556104 -0400 +@@ -358,7 +358,6 @@ + SET(mysql_config_COMPONENT COMPONENT Development) + SET(BIN_SCRIPTS + msql2mysql +- mysql_config + mysql_fix_extensions + mysql_setpermission + mysql_zap +@@ -372,6 +371,12 @@ + mysqld_safe + ps_tokudb_admin + ) ++ 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