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 A3992138350 for ; Tue, 17 Mar 2020 00:57:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF6A7E0B7B; Tue, 17 Mar 2020 00:57:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6A8B7E0B7B for ; Tue, 17 Mar 2020 00:57:55 +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 1519D34F21B for ; Tue, 17 Mar 2020 00:57:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0CDEAF for ; Tue, 17 Mar 2020 00:57:51 +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: <1584406556.b2acb6e8c9967432ac93905e707d5217f926f9cb.whissi@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mysql-8.0.19-without-clientlibs-tools.patch 20018_all_percona-server-8.0.18-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: b2acb6e8c9967432ac93905e707d5217f926f9cb X-VCS-Branch: master Date: Tue, 17 Mar 2020 00:57:51 +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: 609cb20a-a390-4182-880d-ef8f626844b0 X-Archives-Hash: c0a0b02947d2464c19ae6185ae68d512 commit: b2acb6e8c9967432ac93905e707d5217f926f9cb Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Mar 17 00:55:56 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Mar 17 00:55:56 2020 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=b2acb6e8 Fix 20018_all_*-8.0.*-without-clientlibs-tools.patch ICU is not required when building client tools only. Bug: https://bugs.gentoo.org/712072 Signed-off-by: Thomas Deutschmann gentoo.org> 20018_all_mysql-8.0.19-without-clientlibs-tools.patch | 13 ++++++++++++- ...all_percona-server-8.0.18-without-clientlibs-tools.patch | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/20018_all_mysql-8.0.19-without-clientlibs-tools.patch b/20018_all_mysql-8.0.19-without-clientlibs-tools.patch index ea6744e..722ddac 100644 --- a/20018_all_mysql-8.0.19-without-clientlibs-tools.patch +++ b/20018_all_mysql-8.0.19-without-clientlibs-tools.patch @@ -1,6 +1,17 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1285,7 +1285,9 @@ IF(WITH_UNIT_TESTS) +@@ -1200,7 +1200,9 @@ ENDIF() + # Add lz4 library + MYSQL_CHECK_LZ4() + # Add icu library +-MYSQL_CHECK_ICU() ++IF(NOT WITHOUT_SERVER) ++ MYSQL_CHECK_ICU() ++ENDIF() + # Add SASL library + MYSQL_CHECK_SASL() + # Add protoc and libprotobuf +@@ -1285,7 +1287,9 @@ IF(WITH_UNIT_TESTS) INCLUDE(googletest) ENDIF() diff --git a/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch b/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch index bf07285..0b466ea 100644 --- a/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch +++ b/20018_all_percona-server-8.0.18-without-clientlibs-tools.patch @@ -1,6 +1,17 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1284,7 +1284,9 @@ IF(WITH_UNIT_TESTS) +@@ -1199,7 +1199,9 @@ ENDIF() + # Add lz4 library + MYSQL_CHECK_LZ4() + # Add icu library +-MYSQL_CHECK_ICU() ++IF(NOT WITHOUT_SERVER) ++ MYSQL_CHECK_ICU() ++ENDIF() + # Add SASL library + MYSQL_CHECK_SASL() + # Add protoc and libprotobuf +@@ -1284,7 +1286,9 @@ IF(WITH_UNIT_TESTS) INCLUDE(googletest) ENDIF()