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 E6D9A1382C5 for ; Fri, 9 Mar 2018 15:12:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44049E096F; Fri, 9 Mar 2018 15:12:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 210BEE096F for ; Fri, 9 Mar 2018 15:12:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D53F8335C31 for ; Fri, 9 Mar 2018 15:12:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 696271CC for ; Fri, 9 Mar 2018 15:12:49 +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: <1520608352.d7129d5122f41176422c625002097dac3fafcb3d.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.9-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: d7129d5122f41176422c625002097dac3fafcb3d X-VCS-Branch: master Date: Fri, 9 Mar 2018 15:12:49 +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: e24783af-5882-48b5-be55-1a26c0073c6e X-Archives-Hash: 60edbd28f8aad55edbebd5a15f2a18df commit: d7129d5122f41176422c625002097dac3fafcb3d Author: Brian Evans gentoo org> AuthorDate: Fri Mar 9 15:12:32 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Mar 9 15:12:32 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=d7129d51 client-libs: fix malformed patch 20018_all_mariadb-10.2.9-without-clientlibs-tools.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch index 36dff10..40f6a30 100644 --- a/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch @@ -54,11 +54,12 @@ 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 2018-02-27 16:45:56.470183732 -0500 -+++ b/extra/CMakeLists.txt 2018-02-27 16:53:11.095621060 -0500 -@@ -46,12 +46,17 @@ +--- a/extra/CMakeLists.txt 2018-02-25 22:27:15.000000000 -0500 ++++ b/extra/CMakeLists.txt 2018-03-09 10:08:24.532158129 -0500 +@@ -46,10 +46,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) @@ -71,9 +72,7 @@ diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt -MYSQL_ADD_EXECUTABLE(perror perror.c) ADD_DEPENDENCIES(perror GenError) TARGET_LINK_LIBRARIES(perror mysys) - - IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) + diff -aurN a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt --- a/libmariadb/CMakeLists.txt 2018-02-27 16:45:56.434184441 -0500 +++ b/libmariadb/CMakeLists.txt 2018-02-28 09:15:16.258725638 -0500