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 9C9E9138334 for ; Sat, 4 Aug 2018 23:23:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A497E07DF; Sat, 4 Aug 2018 23:23: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 22840E07DF for ; Sat, 4 Aug 2018 23:23: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 DAC6C335C8D for ; Sat, 4 Aug 2018 23:23:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3E7B348 for ; Sat, 4 Aug 2018 23:23:31 +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: <1533424997.b0ef30fe27f707ab0b55e35cb8934fa1bb88b945.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mysql-5.6.25-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: b0ef30fe27f707ab0b55e35cb8934fa1bb88b945 X-VCS-Branch: master Date: Sat, 4 Aug 2018 23:23:31 +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: 8c19b916-394b-4188-a8e7-b67b36a44fb6 X-Archives-Hash: 23f2308d066fb69f48817298be70c663 commit: b0ef30fe27f707ab0b55e35cb8934fa1bb88b945 Author: Brian Evans gentoo org> AuthorDate: Sat Aug 4 23:23:17 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Sat Aug 4 23:23:17 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=b0ef30fe Fix tests on 5.6 for clientlibs ...all_mysql-5.6.25-without-clientlibs-tools.patch | 37 +++++++++------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/20018_all_mysql-5.6.25-without-clientlibs-tools.patch b/20018_all_mysql-5.6.25-without-clientlibs-tools.patch index 35e60de..3ae9551 100644 --- a/20018_all_mysql-5.6.25-without-clientlibs-tools.patch +++ b/20018_all_mysql-5.6.25-without-clientlibs-tools.patch @@ -52,33 +52,26 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt 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 -@@ -59,15 +59,16 @@ - ADD_DEPENDENCIES(GenError copy_openssl_extra) +--- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400 ++++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400 +@@ -60,11 +60,16 @@ ENDIF() -+IF(NOT WITHOUT_CLIENTLIBS) -+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) -+ SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) --MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) --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) -+ 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) ++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(resolveip resolveip.c) - TARGET_LINK_LIBRARIES(resolveip mysys mysys_ssl) +-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