- updated to 5.7.28-31

[packages/mysql.git] / mysql-opt.patch

diff --git a/mysql-opt.patch b/mysql-opt.patch
index eaa5c4e71b752237a11b9b65c1bad35eeb1b7a18..c24063f9a3c67a6ea7f0ac85537078e5a9bf333e 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,47 +1,7 @@
---- percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake~ 2016-06-19 22:55:34.000000000 +0300
-+++ percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake  2016-06-19 22:58:00.531159698 +0300
-@@ -33,8 +33,8 @@
-     IF(WITH_VALGRIND)
-       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
-     ENDIF()
--    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
--    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -42,20 +42,20 @@
-     IF(WITH_VALGRIND)
-       SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")
-     ENDIF()
--    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
--    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # Default Clang flags
-   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
--    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
--    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
--    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
--    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # Solaris flags
-
---- percona-server-5.7.23-23/cmake/build_configurations/compiler_options.cmake.orig    2018-10-14 08:44:45.291573886 +0200
-+++ percona-server-5.7.23-23/cmake/build_configurations/compiler_options.cmake 2018-10-14 08:44:55.181573772 +0200
-@@ -25,17 +25,17 @@
+diff -ur percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_options.cmake percona-server-5.7.28-31/cmake/build_configurations/compiler_options.cmake
+--- percona-server-5.7.28-31.orig/cmake/build_configurations/compiler_options.cmake    2019-12-16 22:33:24.884000000 +0100
++++ percona-server-5.7.28-31/cmake/build_configurations/compiler_options.cmake 2019-12-16 22:34:14.208000000 +0100
+@@ -32,17 +32,17 @@
    SET(64BIT 1)
  ENDIF()
  
@@ -64,12 +24,39 @@
      ENDIF()
    ENDIF()
  
-@@ -140,7 +140,7 @@
+@@ -68,8 +68,8 @@
+     IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
+       SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
+     ENDIF()
+-    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
+-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
+   ENDIF()
+   IF(CMAKE_COMPILER_IS_GNUCXX)
+     SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+@@ -102,8 +102,8 @@
+   # Default Clang flags
+   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+-    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
+-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
+   ENDIF()
+   IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+@@ -153,10 +153,10 @@
  
        SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
        SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS}")
 -      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++03")
+-      SET(CMAKE_C_FLAGS_DEBUG       "${COMMON_C_FLAGS}")
 +      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++11")
-       SET(CMAKE_C_FLAGS_DEBUG       "${COMMON_C_FLAGS}")
++      SET(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
        SET(CMAKE_CXX_FLAGS_DEBUG     "${COMMON_CXX_FLAGS}")
-       SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${COMMON_C_FLAGS}")
+-      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${COMMON_C_FLAGS}")
++      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
+       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
+     ENDIF()
+   ENDIF()