diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-03-09 10:31:58 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-03-09 10:31:58 -0500 |
| commit | 370e827dc0e64d9f97b63711ce28f87bd16fd93b (patch) | |
| tree | 3c83c05588beb6d97124650834eeacfc46953ae1 /20018_all_mariadb-10.0.20-without-clientlibs-tools.patch | |
| parent | client-libs: fix malformed patch (diff) | |
| download | mysql-extras-370e827dc0e64d9f97b63711ce28f87bd16fd93b.tar.gz mysql-extras-370e827dc0e64d9f97b63711ce28f87bd16fd93b.tar.bz2 mysql-extras-370e827dc0e64d9f97b63711ce28f87bd16fd93b.zip | |
client-libs: Apply previous change to 10.0 and 10.1 version patches
Diffstat (limited to '20018_all_mariadb-10.0.20-without-clientlibs-tools.patch')
| -rw-r--r-- | 20018_all_mariadb-10.0.20-without-clientlibs-tools.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch b/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch index 7b759f3..8d3b41e 100644 --- a/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch @@ -53,26 +53,23 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt --- a/extra/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400 +++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400 -@@ -54,12 +54,14 @@ +@@ -54,10 +54,15 @@ DEPENDS ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) --MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) --TARGET_LINK_LIBRARIES(my_print_defaults mysys) +IF(NOT WITHOUT_CLIENTLIBS) -+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -+ TARGET_LINK_LIBRARIES(my_print_defaults mysys) - --MYSQL_ADD_EXECUTABLE(perror perror.c) --ADD_DEPENDENCIES(perror GenError) --TARGET_LINK_LIBRARIES(perror mysys) -+ MYSQL_ADD_EXECUTABLE(perror perror.c) -+ ADD_DEPENDENCIES(perror GenError) -+ TARGET_LINK_LIBRARIES(perror mysys) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++MYSQL_ADD_EXECUTABLE(perror perror.c) ++ELSE(NOT WITHOUT_CLIENTLIBS) ++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) ++ADD_EXECUTABLE(perror perror.c) +ENDIF(NOT WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(my_print_defaults mysys) - IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) +-MYSQL_ADD_EXECUTABLE(perror perror.c) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys) + diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt --- a/scripts/CMakeLists.txt 2015-06-24 10:28:12.800169100 -0400 +++ b/scripts/CMakeLists.txt 2015-06-24 10:42:49.682169100 -0400 |