summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-05-28 20:34:33 -0400
committerBrian Evans <grknight@gentoo.org>2018-05-28 20:34:33 -0400
commit86ca91356862d9c4966ba880da4c33c992e16fa0 (patch)
tree8dad531f064becef3a72c9387cd27872b0e9d958
parentclient-libs: fix further errors (diff)
downloadmysql-extras-86ca91356862d9c4966ba880da4c33c992e16fa0.tar.gz
mysql-extras-86ca91356862d9c4966ba880da4c33c992e16fa0.tar.bz2
mysql-extras-86ca91356862d9c4966ba880da4c33c992e16fa0.zip
client-libs: Remove a section on pluginsmysql-extras-20180529-0042Z
Can be controlled by CMake options instead
-rw-r--r--20018_all_mariadb-10.2.16-without-clientlibs-tools.patch15
1 files changed, 0 insertions, 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