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 94E5E1382C5 for ; Thu, 8 Mar 2018 19:38:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E638EE096C; Thu, 8 Mar 2018 19:38:24 +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 BD9FAE096C for ; Thu, 8 Mar 2018 19:38:24 +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 EFA92335C09 for ; Thu, 8 Mar 2018 19:38:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD39F240 for ; Thu, 8 Mar 2018 19:38:22 +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: <1520537655.3584815a283b153d5df68daf6d0e58d9c82f1f0c.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: 3584815a283b153d5df68daf6d0e58d9c82f1f0c X-VCS-Branch: master Date: Thu, 8 Mar 2018 19:38:22 +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: ef456713-888e-44f8-96ee-1f6b22399e4f X-Archives-Hash: 81ec76ea05f2753d45d4296ed5ab5515 commit: 3584815a283b153d5df68daf6d0e58d9c82f1f0c Author: Brian Evans gentoo org> AuthorDate: Thu Mar 8 19:34:15 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Mar 8 19:34:15 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=3584815a client-libs: Fix creation of my_print_defaults but keep it from install 20018_all_mariadb-10.2.9-without-clientlibs-tools.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 5919c67..db72584 100644 --- a/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch @@ -56,18 +56,18 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt 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,14 @@ +@@ -46,12 +46,12 @@ 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(my_print_defaults my_print_defaults.c) ++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) - MYSQL_ADD_EXECUTABLE(perror perror.c) +-MYSQL_ADD_EXECUTABLE(perror perror.c) ++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)