* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/
@ 2019-03-02 0:40 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-03-02 0:40 UTC (permalink / raw
To: gentoo-commits
commit: 61b72a0b920c4b49b432d62058b2374d35ae24f6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar 1 17:57:11 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 00:40:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b72a0b
dev-db/percona-xtrabackup: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11203
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ercona-xtrabackup-2.4.10-fix-gcc6-isystem.patch | 112 ---------------------
...percona-xtrabackup-2.4.6-fix-gcc6-isystem.patch | 112 ---------------------
2 files changed, 224 deletions(-)
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.10-fix-gcc6-isystem.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.10-fix-gcc6-isystem.patch
deleted file mode 100644
index c38398a1ce7..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.10-fix-gcc6-isystem.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Do not use -isystem to add headers, as they break GCC 6's header wrapping.
-See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -52,7 +52,7 @@ IF(NOT WITHOUT_SERVER)
- upgrade/program.cc
- )
- ADD_COMPILE_FLAGS(
-- upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
---- a/client/base/CMakeLists.txt
-+++ b/client/base/CMakeLists.txt
-@@ -49,7 +49,7 @@ ADD_COMPILE_FLAGS(
- mutex.cc
- mysql_query_runner.cc
- show_variable_query_extractor.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- TARGET_LINK_LIBRARIES(client_base mysqlclient)
---- a/client/dump/CMakeLists.txt
-+++ b/client/dump/CMakeLists.txt
-@@ -50,7 +50,7 @@ IF(USING_LOCAL_BOOST)
-
- ADD_COMPILE_FLAGS(
- ${BOOST_LIB_SOURCES}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- IF(HAVE_clock_gettime_IN_rt)
-@@ -145,7 +145,7 @@ TARGET_LINK_LIBRARIES(mysqlpump_lib
-
- ADD_COMPILE_FLAGS(
- ${MYSQLPUMP_LIB_SOURCES}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- # Files that use Boost sources that trigger compilation warnings
-@@ -179,7 +179,7 @@ ADD_COMPILE_FLAGS(
- )
- MYSQL_ADD_EXECUTABLE(mysqlpump program.cc)
- ADD_COMPILE_FLAGS(
-- program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB})
---- a/libmysqld/CMakeLists.txt
-+++ b/libmysqld/CMakeLists.txt
-@@ -123,7 +123,7 @@ ADD_COMPILE_FLAGS(
- ../sql/item_geofunc_setops.cc
- ../sql/item_json_func.cc
- ../sql/spatial.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- ADD_COMPILE_FLAGS(
---- a/sql/CMakeLists.txt
-+++ b/sql/CMakeLists.txt
-@@ -311,7 +311,7 @@ ADD_COMPILE_FLAGS(
- item_geofunc_setops.cc
- item_json_func.cc
- spatial.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- ADD_COMPILE_FLAGS(
---- a/storage/innobase/xtrabackup/src/CMakeLists.txt
-+++ b/storage/innobase/xtrabackup/src/CMakeLists.txt
-@@ -79,7 +79,7 @@ SET(keyring_source_files
-
- ADD_COMPILE_FLAGS(
- ${keyring_source_files}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- -DEMBEDDED_LIBRARY
- )
-
---- a/unittest/gunit/CMakeLists.txt
-+++ b/unittest/gunit/CMakeLists.txt
-@@ -385,7 +385,7 @@ IF (MERGE_UNITTESTS)
- ENDIF()
- ADD_COMPILE_FLAGS(
- ${MERGE_SMALL_TESTS}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
- IF(WIN32)
-@@ -467,11 +467,11 @@ ENDIF(MERGE_UNITTESTS)
- ENDIF()
- ADD_COMPILE_FLAGS(
- bounded_queue-t.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- ADD_COMPILE_FLAGS(
- pump_object_filter-t.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- FOREACH(test ${SERVER_TESTS})
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.6-fix-gcc6-isystem.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.6-fix-gcc6-isystem.patch
deleted file mode 100644
index 6418e34a8d6..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.6-fix-gcc6-isystem.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Do not use -isystem to add headers, as they break GCC 6's header wrapping.
-See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-
---- a/client/base/CMakeLists.txt
-+++ b/client/base/CMakeLists.txt
-@@ -49,7 +49,7 @@
- mutex.cc
- mysql_query_runner.cc
- show_variable_query_extractor.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- TARGET_LINK_LIBRARIES(client_base mysqlclient)
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -52,7 +52,7 @@
- upgrade/program.cc
- )
- ADD_COMPILE_FLAGS(
-- upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
---- a/client/dump/CMakeLists.txt
-+++ b/client/dump/CMakeLists.txt
-@@ -68,7 +68,7 @@
- ADD_COMPILE_FLAGS(
- ${BOOST_LIB_SOURCES}
- ${BOOST_THREAD_SOURCES}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- IF(HAVE_clock_gettime_IN_rt)
-@@ -163,7 +163,7 @@
-
- ADD_COMPILE_FLAGS(
- ${MYSQLPUMP_LIB_SOURCES}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- # Files that use Boost sources that trigger compilation warnings
-@@ -199,7 +199,7 @@
- )
- MYSQL_ADD_EXECUTABLE(mysqlpump program.cc)
- ADD_COMPILE_FLAGS(
-- program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB})
---- a/libmysqld/CMakeLists.txt
-+++ b/libmysqld/CMakeLists.txt
-@@ -115,7 +115,7 @@
- ../sql/item_geofunc_setops.cc
- ../sql/item_json_func.cc
- ../sql/spatial.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- # Fixes "C1128: number of sections exceeded object file format limit" in MSVC /MD
---- a/sql/CMakeLists.txt
-+++ b/sql/CMakeLists.txt
-@@ -309,7 +309,7 @@
- item_geofunc_setops.cc
- item_json_func.cc
- spatial.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- # Fixes "C1128: number of sections exceeded object file format limit" in MSVC /MD
---- a/storage/innobase/xtrabackup/src/CMakeLists.txt
-+++ b/storage/innobase/xtrabackup/src/CMakeLists.txt
-@@ -68,7 +68,7 @@
- ../../../../plugin/keyring/keyring_key.cc
- ../../../../plugin/keyring/buffered_file_io.cc
- ../../../../plugin/keyring/keys_container.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- ADD_COMPILE_FLAGS(
---- a/unittest/gunit/CMakeLists.txt
-+++ b/unittest/gunit/CMakeLists.txt
-@@ -378,7 +378,7 @@
- ENDIF()
- ADD_COMPILE_FLAGS(
- ${MERGE_SMALL_TESTS}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-@@ -453,11 +453,11 @@
- ENDIF()
- ADD_COMPILE_FLAGS(
- bounded_queue-t.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- ADD_COMPILE_FLAGS(
- pump_object_filter-t.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- FOREACH(test ${SERVER_TESTS})
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/
@ 2021-10-08 21:51 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-10-08 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 07b7466e378c823a3013faf0c72c0df22362199a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct 1 15:50:07 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 8 21:51:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b7466e
dev-db/percona-xtrabackup: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/22459
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../percona-xtrabackup-8.0.13-remove-rpm.patch | 32 -----------------
...backup-8.0.22-fix-building-against-ICU-68.patch | 28 ---------------
.../percona-xtrabackup-8.0.22-remove-rpm.patch | 31 ----------------
.../files/percona-xtrabackup-8.0.23-gcc11.patch | 41 ----------------------
4 files changed, 132 deletions(-)
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
deleted file mode 100644
index 759598637a8..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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.
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
deleted file mode 100644
index b3e1662a0cf..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 16048ed60bef16d4bf1e361a59e7899845b9426a Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Sun, 20 Dec 2020 21:47:33 +0100
-Subject: [PATCH 10/10] Fix building against >=ICU-68
-
-Link: https://github.com/unicode-org/icu/commit/a18df7ba2834afc2b577a1d5a7d906868ade6fa9
-Bug: https://bugs.gentoo.org/759070
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- sql/mysqld.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index c400e5584..5d2ebfaea 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -7323,7 +7323,7 @@ int mysqld_main(int argc, char **argv)
- if (opt_keyring_migration_source || opt_keyring_migration_destination ||
- migrate_connect_options) {
- Migrate_keyring mk;
-- my_getopt_skip_unknown = TRUE;
-+ my_getopt_skip_unknown = true;
- if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
- opt_keyring_migration_destination, opt_keyring_migration_user,
- opt_keyring_migration_host, opt_keyring_migration_password,
---
-2.29.2
-
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
deleted file mode 100644
index 91f67c43716..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -222,28 +222,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
-- )
-- EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
-- 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()
--
- # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
- IF(APPLE)
- IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
deleted file mode 100644
index 83aa6ab78a5..00000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/extra/robin-hood-hashing/robin_hood.h
-+++ b/extra/robin-hood-hashing/robin_hood.h
-@@ -42,6 +42,7 @@
- #include <algorithm>
- #include <cstdlib>
- #include <cstring>
-+#include <limits>
- #include <functional>
- #include <memory> // only to support hash of smart pointers
- #include <stdexcept>
---- a/include/my_alloc.h
-+++ b/include/my_alloc.h
-@@ -32,6 +32,7 @@
-
- #include <string.h>
-
-+#include <cstdint>
- #include <memory>
- #include <new>
- #include <type_traits>
---- a/include/mysql/components/services/page_track_service.h
-+++ b/include/mysql/components/services/page_track_service.h
-@@ -27,6 +27,7 @@
- #include <mysql/components/service.h>
- #include <functional>
-
-+#include <stddef.h>
- #include <stdint.h>
-
- #ifdef __cplusplus
---- a/sql-common/sql_string.cc
-+++ b/sql-common/sql_string.cc
-@@ -23,6 +23,7 @@
- #include "sql_string.h"
-
- #include <algorithm>
-+#include <limits>
-
- #include "my_dbug.h"
- #include "my_macros.h"
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/
@ 2023-11-20 20:20 Ulrich Müller
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2023-11-20 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 28d4031122398fcc4051d785b5ec8ef118c835e4
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov 7 18:01:17 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 20:19:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d40311
dev-db/percona-xtrabackup: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../percona-xtrabackup-2.4.20-fix-gcc10.patch | 26 ----------------------
...rabackup-2.4.6-remove-boost-version-check.patch | 19 ----------------
2 files changed, 45 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
deleted file mode 100644
index 8987082d1f9c..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-2.4.6-remove-boost-version-check.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.6-remove-boost-version-check.patch
deleted file mode 100644
index 48a7fcc783f0..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.6-remove-boost-version-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove Boost version check which makes using the
-system boost libraries close to impossible.
-
---- a/cmake/boost.cmake
-+++ b/cmake/boost.cmake
-@@ -262,13 +262,6 @@
- COULD_NOT_FIND_BOOST()
- ENDIF()
-
--IF(NOT BOOST_MINOR_VERSION EQUAL 59)
-- MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
-- "we need 59"
-- )
-- COULD_NOT_FIND_BOOST()
--ENDIF()
--
- MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
-
- # We have a limited set of patches/bugfixes here:
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-20 20:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-02 0:40 [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-10-08 21:51 Conrad Kostecki
2023-11-20 20:20 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox