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 67DC1138330 for ; Tue, 29 May 2018 00:35:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 578F0E07D8; Tue, 29 May 2018 00:35:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 2CAF1E07D8 for ; Tue, 29 May 2018 00:35:35 +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 A9FC9335C73 for ; Tue, 29 May 2018 00:35:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B11332AE for ; Tue, 29 May 2018 00:35: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: <1527554073.86ca91356862d9c4966ba880da4c33c992e16fa0.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.16-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 86ca91356862d9c4966ba880da4c33c992e16fa0 X-VCS-Branch: master Date: Tue, 29 May 2018 00:35: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: 333bddba-5589-4c4b-b72d-e7c4e8954593 X-Archives-Hash: 44c42faf64efe00bc5de7eb69bcc1149 commit: 86ca91356862d9c4966ba880da4c33c992e16fa0 Author: Brian Evans gentoo org> AuthorDate: Tue May 29 00:34:33 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue May 29 00:34:33 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=86ca9135 client-libs: Remove a section on plugins Can be controlled by CMake options instead 20018_all_mariadb-10.2.16-without-clientlibs-tools.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch index 510e647..a0159fe 100644 --- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch @@ -162,21 +162,6 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL IF(WIN32) # On Windows, install PDB -diff -aurN a/libmariadb/plugins/CMakeLists.txt b/libmariadb/plugins/CMakeLists.txt ---- a/libmariadb/plugins/CMakeLists.txt 2018-02-27 16:45:56.445184224 -0500 -+++ b/libmariadb/plugins/CMakeLists.txt 2018-02-27 16:59:59.028574104 -0500 -@@ -1,3 +1,6 @@ -+IF(WITHOUT_CLIENTLIBS) -+INCLUDE(${CC_SOURCE_DIR}/plugins/pvio/CMakeLists.txt) -+ELSE(WITHOUT_CLIENTLIBS) - SET(PLUGIN_EXTRA_FILES ${CC_SOURCE_DIR}/libmariadb/ma_errmsg.c) - FILE(GLOB plugin_dirs ${CC_SOURCE_DIR}/plugins/*) - FOREACH(dir ${plugin_dirs}) -@@ -5,3 +6,4 @@ - ADD_SUBDIRECTORY(${dir}) - ENDIF() - ENDFOREACH() -+ENDIF(WITHOUT_CLIENTLIBS) diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt --- a/scripts/CMakeLists.txt 2018-02-27 16:45:56.384185424 -0500 +++ b/scripts/CMakeLists.txt 2018-02-27 16:54:34.623973364 -0500