diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
commit | 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch) | |
tree | 83fc5facb6b12be510a37bc3d241cc63e965b13a /dev-db/percona-xtrabackup/files | |
parent | feb0daf81d888e9160f9f94502de09b66f2a63fd (diff) |
gentoo resync : 29.06.2020
Diffstat (limited to 'dev-db/percona-xtrabackup/files')
-rw-r--r-- | dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch | 26 | ||||
-rw-r--r-- | dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch | 32 |
2 files changed, 58 insertions, 0 deletions
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch new file mode 100644 index 000000000000..8987082d1f9c --- /dev/null +++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch @@ -0,0 +1,26 @@ +diff --git a/sql/mysqld.cc b/sql/mysqld.cc +index 3801448b..83098498 100644 +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -625,7 +625,7 @@ struct system_variables global_system_variables; + struct system_variables max_system_variables; + struct system_status_var global_status_var; + +-MY_TMPDIR mysql_tmpdir_list; ++extern MY_TMPDIR mysql_tmpdir_list; + MY_BITMAP temp_pool; + + CHARSET_INFO *system_charset_info, *files_charset_info ; +diff --git a/storage/innobase/xtrabackup/src/xbstream.c b/storage/innobase/xtrabackup/src/xbstream.c +index 611f8c04..f0c57588 100644 +--- a/storage/innobase/xtrabackup/src/xbstream.c ++++ b/storage/innobase/xtrabackup/src/xbstream.c +@@ -55,7 +55,7 @@ datasink_t datasink_xbstream; + datasink_t datasink_compress; + datasink_t datasink_tmpfile; + datasink_t datasink_encrypt; +-datasink_t datasink_buffer; ++extern datasink_t datasink_buffer; + + static run_mode_t opt_mode; + static char * opt_directory = NULL; diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch new file mode 100644 index 000000000000..759598637a82 --- /dev/null +++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b9865e2..e3c82cdd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -181,27 +181,6 @@ ENDIF() + OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF) + MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER) + +-# Use 'uname -r' and 'rpm -qf /' to figure out host system. +-# For Docker images we cannot trust uname, so use rpm instead. +-IF(UNIX) +- FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin) +- IF(MY_UNAME) +- EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s +- OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME +- OUTPUT_STRIP_TRAILING_WHITESPACE +- RESULT_VARIABLE MY_UNAME_RESULT +- ) +- ENDIF() +- FIND_PROGRAM(MY_RPM rpm /bin /usr/bin) +- IF(MY_RPM) +- EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf / +- OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME +- OUTPUT_STRIP_TRAILING_WHITESPACE +- RESULT_VARIABLE MY_RPM_RESULT +- ) +- ENDIF() +-ENDIF() +- + IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER + AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER) + # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below. |