Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Tue, 29 May 2018 00:35:36
Message-Id: 1527554073.86ca91356862d9c4966ba880da4c33c992e16fa0.grknight@gentoo
1 commit: 86ca91356862d9c4966ba880da4c33c992e16fa0
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 00:34:33 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 00:34:33 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=86ca9135
7
8 client-libs: Remove a section on plugins
9
10 Can be controlled by CMake options instead
11
12 20018_all_mariadb-10.2.16-without-clientlibs-tools.patch | 15 ---------------
13 1 file changed, 15 deletions(-)
14
15 diff --git a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
16 index 510e647..a0159fe 100644
17 --- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
18 +++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
19 @@ -162,21 +162,6 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
20
21 IF(WIN32)
22 # On Windows, install PDB
23 -diff -aurN a/libmariadb/plugins/CMakeLists.txt b/libmariadb/plugins/CMakeLists.txt
24 ---- a/libmariadb/plugins/CMakeLists.txt 2018-02-27 16:45:56.445184224 -0500
25 -+++ b/libmariadb/plugins/CMakeLists.txt 2018-02-27 16:59:59.028574104 -0500
26 -@@ -1,3 +1,6 @@
27 -+IF(WITHOUT_CLIENTLIBS)
28 -+INCLUDE(${CC_SOURCE_DIR}/plugins/pvio/CMakeLists.txt)
29 -+ELSE(WITHOUT_CLIENTLIBS)
30 - SET(PLUGIN_EXTRA_FILES ${CC_SOURCE_DIR}/libmariadb/ma_errmsg.c)
31 - FILE(GLOB plugin_dirs ${CC_SOURCE_DIR}/plugins/*)
32 - FOREACH(dir ${plugin_dirs})
33 -@@ -5,3 +6,4 @@
34 - ADD_SUBDIRECTORY(${dir})
35 - ENDIF()
36 - ENDFOREACH()
37 -+ENDIF(WITHOUT_CLIENTLIBS)
38 diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
39 --- a/scripts/CMakeLists.txt 2018-02-27 16:45:56.384185424 -0500
40 +++ b/scripts/CMakeLists.txt 2018-02-27 16:54:34.623973364 -0500