diff options
Diffstat (limited to 'dev-db/percona-xtrabackup/files')
4 files changed, 356 insertions, 0 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 new file mode 100644 index 000000000000..c38398a1ce77 --- /dev/null +++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.10-fix-gcc6-isystem.patch @@ -0,0 +1,112 @@ +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.11-fix-gcc6-isystem.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch new file mode 100644 index 000000000000..4fed659cdae6 --- /dev/null +++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch @@ -0,0 +1,113 @@ +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 + +diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt +index dbf1c48..e5d7347 100644 +--- 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) +diff --git a/client/base/CMakeLists.txt b/client/base/CMakeLists.txt +index b206de7..91cce4c 100644 +--- 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) +diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt +index fdbb631..bae2ce7 100644 +--- 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}) +diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt +index 44c1d26..dac03d9 100644 +--- 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( +diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt +index 1d1231f..9a35fa8 100644 +--- a/sql/CMakeLists.txt ++++ b/sql/CMakeLists.txt +@@ -312,7 +312,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( +diff --git a/unittest/gunit/CMakeLists.txt b/unittest/gunit/CMakeLists.txt +index f0123b8..f2169f9 100644 +--- 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 new file mode 100644 index 000000000000..6418e34a8d6b --- /dev/null +++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.6-fix-gcc6-isystem.patch @@ -0,0 +1,112 @@ +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}) 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 new file mode 100644 index 000000000000..48a7fcc783f0 --- /dev/null +++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.6-remove-boost-version-check.patch @@ -0,0 +1,19 @@ +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: |