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})
