summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-03-08 14:34:15 -0500
committerBrian Evans <grknight@gentoo.org>2018-03-08 14:34:15 -0500
commit3584815a283b153d5df68daf6d0e58d9c82f1f0c (patch)
treeedcdcd07d7f0ddd7c9c5cd50de9eb07bdd44c853 /20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
parentFix patch for client-libs on 10.2/10.3 (diff)
downloadmysql-extras-3584815a283b153d5df68daf6d0e58d9c82f1f0c.tar.gz
mysql-extras-3584815a283b153d5df68daf6d0e58d9c82f1f0c.tar.bz2
mysql-extras-3584815a283b153d5df68daf6d0e58d9c82f1f0c.zip
client-libs: Fix creation of my_print_defaults but keep it from install
Diffstat (limited to '20018_all_mariadb-10.2.9-without-clientlibs-tools.patch')
-rw-r--r--20018_all_mariadb-10.2.9-without-clientlibs-tools.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
index 5919c67..db72584 100644
--- a/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
@@ -56,18 +56,18 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt
diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
--- a/extra/CMakeLists.txt 2018-02-27 16:45:56.470183732 -0500
+++ b/extra/CMakeLists.txt 2018-02-27 16:53:11.095621060 -0500
-@@ -46,12 +46,14 @@
+@@ -46,12 +46,12 @@
DEPENDS
${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
-+IF(NOT WITHOUT_CLIENTLIBS)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
+-MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
TARGET_LINK_LIBRARIES(my_print_defaults mysys)
- MYSQL_ADD_EXECUTABLE(perror perror.c)
+-MYSQL_ADD_EXECUTABLE(perror perror.c)
++ADD_EXECUTABLE(perror perror.c)
ADD_DEPENDENCIES(perror GenError)
TARGET_LINK_LIBRARIES(perror mysys)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
IF(UNIX)
MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)