[gentoo-commits] proj/mysql-extras:master commit in: /

[Brian Evans]

commit:     d7129d5122f41176422c625002097dac3fafcb3d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  9 15:12:32 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Mar  9 15:12:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=d7129d51

client-libs: fix malformed patch

 20018_all_mariadb-10.2.9-without-clientlibs-tools.patch | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 36dff10..40f6a30 100644
--- a/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
@@ -54,11 +54,12 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt
     ADD_SUBDIRECTORY(libmysqld/examples)
    ENDIF(WITH_EMBEDDED_SERVER)
 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,17 @@
+--- a/extra/CMakeLists.txt     2018-02-25 22:27:15.000000000 -0500
++++ b/extra/CMakeLists.txt     2018-03-09 10:08:24.532158129 -0500
+@@ -46,10 +46,15 @@
                    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(perror perror.c)
@@ -71,9 +72,7 @@ diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
 -MYSQL_ADD_EXECUTABLE(perror perror.c)
  ADD_DEPENDENCIES(perror GenError)
  TARGET_LINK_LIBRARIES(perror mysys)
- 
- IF(UNIX)
- MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)
+
 diff -aurN a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
 --- a/libmariadb/CMakeLists.txt        2018-02-27 16:45:56.434184441 -0500
 +++ b/libmariadb/CMakeLists.txt        2018-02-28 09:15:16.258725638 -0500