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 06D69138334 for ; Thu, 31 Oct 2019 00:50:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFAE2E0831; Thu, 31 Oct 2019 00:50:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 D4288E0831 for ; Thu, 31 Oct 2019 00:50:23 +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 C7B0734C5C8 for ; Thu, 31 Oct 2019 00:50:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C49B7F9 for ; Thu, 31 Oct 2019 00:50:08 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1572482997.a2ad81add180c3980619ffb2cf31fc8cf8232580.whissi@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a2ad81add180c3980619ffb2cf31fc8cf8232580 X-VCS-Branch: master Date: Thu, 31 Oct 2019 00:50:08 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5a5e8186-4e35-41f3-8998-7f64b193e7fa X-Archives-Hash: 164abe4b3b4ee45dd476af6bf6e77940 commit: a2ad81add180c3980619ffb2cf31fc8cf8232580 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 31 00:49:57 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 31 00:49:57 2019 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=a2ad81ad Fix 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch Signed-off-by: Thomas Deutschmann gentoo.org> 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch index cf7f747..a1a6eb0 100644 --- a/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch +++ b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch @@ -20,7 +20,7 @@ ADD_SUBDIRECTORY(dbug) ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) -@@ -1295,7 +1295,6 @@ IF(WITH_UNIT_TESTS) +@@ -1295,11 +1295,16 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() @@ -28,9 +28,6 @@ ADD_SUBDIRECTORY(utilities) ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(libservices) -@@ -1340,6 +1339,12 @@ IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() +IF(NOT WITHOUT_TOOLS) + # Add system/bundled editline @@ -39,8 +36,8 @@ +ENDIF(NOT WITHOUT_TOOLS) + IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(packaging/rpm-common) - ADD_SUBDIRECTORY(packaging/rpm-oel) + ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(sql) --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -240,12 +240,17 @@ IF(WIN32) @@ -180,4 +177,3 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) -