- updated to 5.7.42-46

[packages/mysql.git] / build.patch

diff --git a/build.patch b/build.patch
index f3dbd717cbe7b0c76621aa2a430edb47d3dbb01c..cbd9439ee0576cf8b54228f4d05d4589b8466591 100644 (file)
--- a/build.patch
+++ b/build.patch
@@ -1,8 +1,8 @@
-diff -ur percona-server-5.7.35-38.orig/cmake/maintainer.cmake percona-server-5.7.35-38/cmake/maintainer.cmake
---- percona-server-5.7.35-38.orig/cmake/maintainer.cmake       2021-11-25 00:03:41.234897661 +0100
-+++ percona-server-5.7.35-38/cmake/maintainer.cmake    2021-11-25 00:05:01.649091453 +0100
-@@ -37,12 +37,6 @@
-       "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
+diff -urNp -x '*.orig' percona-server-5.7.42-46.org/cmake/maintainer.cmake percona-server-5.7.42-46/cmake/maintainer.cmake
+--- percona-server-5.7.42-46.org/cmake/maintainer.cmake        2023-05-29 10:24:29.000000000 +0200
++++ percona-server-5.7.42-46/cmake/maintainer.cmake    2023-07-18 18:19:10.520022888 +0200
+@@ -45,12 +45,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+   STRING_APPEND(MY_CXX_WARNING_FLAGS " -Wno-unused-parameter -Wno-unused-but-set-variable")
  ENDIF()
  
 -# Turn on Werror (warning => error) when using maintainer mode.
@@ -14,10 +14,10 @@ diff -ur percona-server-5.7.35-38.orig/cmake/maintainer.cmake percona-server-5.7
  # Set warning flags for GCC/Clang
  IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
    STRING_APPEND(CMAKE_C_FLAGS " ${MY_C_WARNING_FLAGS}")
-diff -ur percona-server-5.7.35-38.orig/storage/rocksdb/CMakeLists.txt percona-server-5.7.35-38/storage/rocksdb/CMakeLists.txt
---- percona-server-5.7.35-38.orig/storage/rocksdb/CMakeLists.txt       2021-11-25 00:03:45.359907607 +0100
-+++ percona-server-5.7.35-38/storage/rocksdb/CMakeLists.txt    2021-11-25 00:04:04.352953376 +0100
-@@ -57,7 +57,7 @@
+diff -urNp -x '*.orig' percona-server-5.7.42-46.org/storage/rocksdb/CMakeLists.txt percona-server-5.7.42-46/storage/rocksdb/CMakeLists.txt
+--- percona-server-5.7.42-46.org/storage/rocksdb/CMakeLists.txt        2023-07-18 18:18:54.474790338 +0200
++++ percona-server-5.7.42-46/storage/rocksdb/CMakeLists.txt    2023-07-18 18:19:10.520022888 +0200
+@@ -57,7 +57,7 @@ ELSE()
    # get a list of rocksdb library source files
    # run with env -i to avoid passing variables
    EXECUTE_PROCESS(
@@ -26,10 +26,10 @@ diff -ur percona-server-5.7.35-38.orig/storage/rocksdb/CMakeLists.txt percona-se
      OUTPUT_VARIABLE SCRIPT_OUTPUT
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    )
-diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
---- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake       2021-11-25 00:03:46.402910121 +0100
-+++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake    2021-11-25 00:04:04.352953376 +0100
-@@ -221,10 +221,6 @@
+diff -urNp -x '*.orig' percona-server-5.7.42-46.org/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake percona-server-5.7.42-46/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
+--- percona-server-5.7.42-46.org/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake        2023-05-29 14:06:14.000000000 +0200
++++ percona-server-5.7.42-46/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake    2023-07-18 18:19:10.520022888 +0200
+@@ -221,10 +221,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL C
    prepend_cflags_if_supported_remove_unsupported(-Wcast-align)
  endif ()