diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-db/mydumper/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-db/mydumper/files')
-rw-r--r-- | dev-db/mydumper/files/mydumper-atomic.patch | 27 | ||||
-rw-r--r-- | dev-db/mydumper/files/mydumper-mariadb-define.patch | 28 |
2 files changed, 0 insertions, 55 deletions
diff --git a/dev-db/mydumper/files/mydumper-atomic.patch b/dev-db/mydumper/files/mydumper-atomic.patch deleted file mode 100644 index 405e6883fbcb..000000000000 --- a/dev-db/mydumper/files/mydumper-atomic.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake -index 23470a8..2b8ae63 100644 ---- a/cmake/modules/FindMySQL.cmake -+++ b/cmake/modules/FindMySQL.cmake -@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h - - set(TMP_MYSQL_LIBRARIES "") - set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1) --foreach(MY_LIB ${MYSQL_ADD_LIBRARIES}) -- find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB} -- HINTS -- ${MYSQL_ADD_LIBRARY_PATH} -- /usr/lib/mysql -- /usr/lib -- /usr/local/lib -- /usr/local/lib/mysql -- /usr/local/mysql/lib -- ) -- list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}") --endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES}) -- --set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL) -+ -+set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL) - - if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) - set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found") diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch deleted file mode 100644 index ee39a33be818..000000000000 --- a/dev-db/mydumper/files/mydumper-mariadb-define.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000 -+++ b/mydumper.c 2017-10-25 14:53:46.614729185 +0000 -@@ -22,6 +22,11 @@ - #define _FILE_OFFSET_BITS 64 - - #include <mysql.h> -+ -+#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION -+ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR -+#endif -+ - #include <unistd.h> - #include <stdio.h> - #include <string.h> ---- a/myloader.c 2017-09-07 14:53:02.000000000 +0000 -+++ b/myloader.c 2017-10-25 14:55:34.677729185 +0000 -@@ -19,6 +19,11 @@ - #define _FILE_OFFSET_BITS 64 - - #include <mysql.h> -+ -+#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION -+ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR -+#endif -+ - #include <unistd.h> - #include <stdio.h> - #include <string.h> |