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 8C1C3138334 for ; Thu, 28 Jun 2018 01:08:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61E21E0919; Thu, 28 Jun 2018 01:08:35 +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 106D2E0919 for ; Thu, 28 Jun 2018 01:08:35 +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 EEFDE335C9B for ; Thu, 28 Jun 2018 01:08:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAEC5349 for ; Thu, 28 Jun 2018 01:08:30 +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: <1530148085.e2d9073f6238abafd50c83daea0cd49ba43d7f4e.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mysql-5.5.60-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: e2d9073f6238abafd50c83daea0cd49ba43d7f4e X-VCS-Branch: master Date: Thu, 28 Jun 2018 01:08:30 +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: bda13120-1712-48a4-8c4c-43d36cbe024f X-Archives-Hash: 3333897784fcff8a432df738c071c4a5 commit: e2d9073f6238abafd50c83daea0cd49ba43d7f4e Author: Brian Evans gentoo org> AuthorDate: Thu Jun 28 01:08:05 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Jun 28 01:08:05 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=e2d9073f Respin clientlibs for mysql 5.5.60 ...all_mysql-5.5.60-without-clientlibs-tools.patch | 108 +++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/20018_all_mysql-5.5.60-without-clientlibs-tools.patch b/20018_all_mysql-5.5.60-without-clientlibs-tools.patch new file mode 100644 index 0000000..6a00364 --- /dev/null +++ b/20018_all_mysql-5.5.60-without-clientlibs-tools.patch @@ -0,0 +1,108 @@ +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 ++++ b/CMakeLists.txt 2015-06-24 10:34:17.314169100 -0400 +@@ -354,8 +354,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") + CHECK_JEMALLOC() +@@ -404,14 +404,19 @@ + CONFIGURE_PLUGINS() + ENDIF() + +-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(regex) + ADD_SUBDIRECTORY(mysys) + ADD_SUBDIRECTORY(libmysql) +-ADD_SUBDIRECTORY(client) ++IF(NOT WITHOUT_TOOLS) ++ MYSQL_CHECK_READLINE() ++ ADD_SUBDIRECTORY(client) ++ENDIF(NOT WITHOUT_TOOLS) + ADD_SUBDIRECTORY(libservices) + ADD_SUBDIRECTORY(scripts) + ADD_SUBDIRECTORY(sql/share) +@@ -432,6 +437,9 @@ + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) ++ IF(NOT WITHOUT_TOOLS) ++ MYSQL_CHECK_READLINE() ++ ENDIF(NOT 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-06-17 10:54:11.000000000 -0400 ++++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400 +@@ -54,10 +54,15 @@ + DEPENDS + ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) + ++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) + +-MYSQL_ADD_EXECUTABLE(perror perror.c) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys) + +diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +--- a/scripts/CMakeLists.txt 2015-06-24 10:28:12.800169100 -0400 ++++ b/scripts/CMakeLists.txt 2015-06-24 10:42:49.682169100 -0400 +@@ -327,7 +327,6 @@ + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config + mysql_fix_extensions + mysql_setpermission + mysql_secure_installation +@@ -341,6 +340,12 @@ + mysqld_multi + mysqld_safe + ) ++ 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/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +--- a/libmysql/CMakeLists.txt 2015-06-24 12:32:11.606169100 -0400 ++++ b/libmysql/CMakeLists.txt 2015-06-24 13:44:53.857169100 -0400 +@@ -202,14 +202,14 @@ + + IF(UNIX) + GET_TARGET_NAME(mysqlclient lib_name) +- IF(ENABLE_STATIC_LIBS) ++ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS) + INSTALL_SYMLINK(mysqlclient + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a + ${INSTALL_LIBDIR} Development) + ENDIF() + ENDIF() + +-IF(NOT DISABLE_SHARED) ++IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} + COMPONENT SharedLibraries)