summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--20018_all_mariadb-10.2.16-without-clientlibs-tools.patch8
1 files changed, 5 insertions, 3 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 fa449e1..ba97631 100644
--- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
@@ -165,8 +165,10 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
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,4 @@
-+IF(NOT WITHOUT_CLIENTLIBS)
+@@ -1,3 +1,6 @@
++IF(WITHOUT_CLIENTLIBS)
++INCLUDE(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})
@@ -174,7 +176,7 @@ diff -aurN a/libmariadb/plugins/CMakeLists.txt b/libmariadb/plugins/CMakeLists.t
ADD_SUBDIRECTORY(${dir})
ENDIF()
ENDFOREACH()
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
++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